Module Name: src
Committed By: mrg
Date: Tue Feb 5 09:29:20 UTC 2019
Modified Files:
src/sys/conf: copts.mk
src/sys/modules/zlib: Makefile
src/sys/rump/kern/lib/libz: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/conf/copts.mk
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/zlib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/kern/lib/libz/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/copts.mk
diff -u src/sys/conf/copts.mk:1.1 src/sys/conf/copts.mk:1.2
--- src/sys/conf/copts.mk:1.1 Tue Feb 5 08:33:25 2019
+++ src/sys/conf/copts.mk Tue Feb 5 09:29:19 2019
@@ -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
Index: src/sys/modules/zlib/Makefile
diff -u src/sys/modules/zlib/Makefile:1.1 src/sys/modules/zlib/Makefile:1.2
--- src/sys/modules/zlib/Makefile:1.1 Sun Dec 29 08:09:44 2013
+++ src/sys/modules/zlib/Makefile Tue Feb 5 09:29:20 2019
@@ -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 @@ KMOD= zlib
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
Index: src/sys/rump/kern/lib/libz/Makefile
diff -u src/sys/rump/kern/lib/libz/Makefile:1.2 src/sys/rump/kern/lib/libz/Makefile:1.3
--- src/sys/rump/kern/lib/libz/Makefile:1.2 Mon Oct 19 16:16:37 2015
+++ src/sys/rump/kern/lib/libz/Makefile Tue Feb 5 09:29:20 2019
@@ -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 @@ SRCS= zlib.c
.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
