Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys be sure to only apply zlib.c's -Wno-error=implicit-fallt...



details:   https://anonhg.NetBSD.org/src/rev/441ea907cab1
branches:  trunk
changeset: 448568:441ea907cab1
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Feb 05 09:29:19 2019 +0000

description:
be sure to only apply zlib.c's -Wno-error=implicit-fallthrough to GCC 7.
push the setting into the rump and module version too.

diffstat:

 sys/conf/copts.mk               |  4 +++-
 sys/modules/zlib/Makefile       |  6 +++++-
 sys/rump/kern/lib/libz/Makefile |  6 +++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r 5d09651026f8 -r 441ea907cab1 sys/conf/copts.mk
--- a/sys/conf/copts.mk Tue Feb 05 09:28:00 2019 +0000
+++ b/sys/conf/copts.mk Tue Feb 05 09:29:19 2019 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: copts.mk,v 1.1 2019/02/05 08:33:25 mrg Exp $
+#      $NetBSD: copts.mk,v 1.2 2019/02/05 09:29:19 mrg Exp $
 
 # MI per-file compiler options required.
 
 .ifndef _SYS_CONF_COPTS_MK_
 _SYS_CONF_COPTS_MK_=1
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
 COPTS.zlib.c+= -Wno-error=implicit-fallthrough
+.endif
 
 .endif
diff -r 5d09651026f8 -r 441ea907cab1 sys/modules/zlib/Makefile
--- a/sys/modules/zlib/Makefile Tue Feb 05 09:28:00 2019 +0000
+++ b/sys/modules/zlib/Makefile Tue Feb 05 09:29:19 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2013/12/29 08:09:44 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.2 2019/02/05 09:29:20 mrg Exp $
 
 .include "../Makefile.inc"
 
@@ -8,3 +8,7 @@
 SRCS=  zlib.c
 
 .include <bsd.kmodule.mk>
+
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.zlib.c+= -Wno-error=implicit-fallthrough
+.endif
diff -r 5d09651026f8 -r 441ea907cab1 sys/rump/kern/lib/libz/Makefile
--- a/sys/rump/kern/lib/libz/Makefile   Tue Feb 05 09:28:00 2019 +0000
+++ b/sys/rump/kern/lib/libz/Makefile   Tue Feb 05 09:29:19 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2015/10/19 16:16:37 pooka Exp $
+#      $NetBSD: Makefile,v 1.3 2019/02/05 09:29:20 mrg Exp $
 #
 
 # zlib.c is logically in sys/net
@@ -11,3 +11,7 @@
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
+
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.zlib.c+= -Wno-error=implicit-fallthrough
+.endif



Home | Main Index | Thread Index | Old Index