Source-Changes-HG archive

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

[src/trunk]: src - use -Wno-error=implicit-fallthrough with GCC7.



details:   https://anonhg.NetBSD.org/src/rev/fdf70e8285fa
branches:  trunk
changeset: 448488:fdf70e8285fa
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Feb 04 04:05:15 2019 +0000

description:
- use -Wno-error=implicit-fallthrough with GCC7.

diffstat:

 bin/ksh/Makefile                                     |   6 +++++-
 crypto/external/bsd/netpgp/bin/netpgpverify/Makefile |   8 +++++++-
 crypto/external/bsd/netpgp/lib/verify/Makefile       |   8 +++++++-
 crypto/external/bsd/openssh/bin/sftp/Makefile        |   8 +++++++-
 external/bsd/dhcpcd/sbin/dhcpcd/Makefile             |  14 ++++++++++----
 external/bsd/libarchive/lib/libarchive/Makefile      |   9 ++++++++-
 external/bsd/libevent/lib/libevent/Makefile          |   8 +++++++-
 external/bsd/libpcap/lib/Makefile                    |   6 +++++-
 external/bsd/ntp/Makefile.inc                        |   9 ++++++++-
 external/bsd/nvi/usr.bin/nvi/Makefile                |   6 +++++-
 external/bsd/pdisk/bin/Makefile                      |   8 +++++++-
 lib/libbz2/Makefile                                  |   6 +++++-
 lib/libz/Makefile                                    |   7 ++++++-
 sys/modules/pf/Makefile                              |   6 +++++-
 sys/modules/radeondrm/Makefile                       |   6 +++++-
 15 files changed, 97 insertions(+), 18 deletions(-)

diffs (truncated from 307 to 300 lines):

diff -r db75c5f7b7a0 -r fdf70e8285fa bin/ksh/Makefile
--- a/bin/ksh/Makefile  Mon Feb 04 03:58:41 2019 +0000
+++ b/bin/ksh/Makefile  Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.34 2017/06/30 04:22:22 kamil Exp $
+#      $NetBSD: Makefile,v 1.35 2019/02/04 04:05:15 mrg Exp $
 
 WARNS=3
 CWARNFLAGS.clang+=     -Wno-error=cast-qual
@@ -48,4 +48,8 @@
        ${HOST_SH} $(.CURDIR)/mkman ksh $(.CURDIR)/ksh.Man >ksh.1.tmp \
            && mv ksh.1.tmp ksh.1
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS+=        -Wno-error=implicit-fallthrough
+.endif
+
 .include <bsd.prog.mk>
diff -r db75c5f7b7a0 -r fdf70e8285fa crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
--- a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile      Mon Feb 04 03:58:41 2019 +0000
+++ b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile      Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2017/04/17 19:50:27 agc Exp $
+#      $NetBSD: Makefile,v 1.16 2019/02/04 04:05:15 mrg Exp $
 
 PROG=netpgpverify
 BINDIR=                /usr/bin
@@ -26,6 +26,12 @@
 
 .PATH: ${EXTDIST}/src/netpgpverify
 
+.include <bsd.own.mk>
+
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS+=        -Wno-error=implicit-fallthrough
+.endif
+
 .include <bsd.prog.mk>
 
 t tst: ${PROG}
diff -r db75c5f7b7a0 -r fdf70e8285fa crypto/external/bsd/netpgp/lib/verify/Makefile
--- a/crypto/external/bsd/netpgp/lib/verify/Makefile    Mon Feb 04 03:58:41 2019 +0000
+++ b/crypto/external/bsd/netpgp/lib/verify/Makefile    Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/04/17 19:50:28 agc Exp $
+# $NetBSD: Makefile,v 1.10 2019/02/04 04:05:15 mrg Exp $
 
 LIB=netpgpverify
 SRCS+=b64.c
@@ -25,4 +25,10 @@
 INCS=verify.h
 INCSDIR=/usr/include/netpgp
 
+.include <bsd.own.mk>
+
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS+=        -Wno-error=implicit-fallthrough
+.endif
+
 .include <bsd.lib.mk>
diff -r db75c5f7b7a0 -r fdf70e8285fa crypto/external/bsd/openssh/bin/sftp/Makefile
--- a/crypto/external/bsd/openssh/bin/sftp/Makefile     Mon Feb 04 03:58:41 2019 +0000
+++ b/crypto/external/bsd/openssh/bin/sftp/Makefile     Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2012/08/10 12:20:11 joerg Exp $
+#      $NetBSD: Makefile,v 1.6 2019/02/04 04:05:15 mrg Exp $
 
 BINDIR=        /usr/bin
 
@@ -12,4 +12,10 @@
 COPTS.sftp.c+=         -Wno-pointer-sign
 COPTS.sftp-client.c+=  -Wno-pointer-sign
 
+.include <bsd.own.mk>
+
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.sftp.c+=         -Wno-error=implicit-fallthrough
+.endif
+
 .include <bsd.prog.mk>
diff -r db75c5f7b7a0 -r fdf70e8285fa external/bsd/dhcpcd/sbin/dhcpcd/Makefile
--- a/external/bsd/dhcpcd/sbin/dhcpcd/Makefile  Mon Feb 04 03:58:41 2019 +0000
+++ b/external/bsd/dhcpcd/sbin/dhcpcd/Makefile  Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2018/02/02 01:02:39 mrg Exp $
+# $NetBSD: Makefile,v 1.44 2019/02/04 04:05:15 mrg Exp $
 #
 
 WARNS?=                6
@@ -74,9 +74,15 @@
        ${TOOL_SED} ${SED_SYS} ${DIST}/src/${f}.in > $@
 .endfor
 
-# XXXGCC5
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 5 && ${ACTIVE_CC} == "gcc"
-COPTS.if-bsd.c+=  -Wno-error=sign-conversion
+.if defined(HAVE_GCC) && ${ACTIVE_CC} == "gcc"
+. if ${HAVE_GCC} >= 6
+COPTS.if-bsd.c+=       -Wno-error=sign-conversion
+. endif
+. if ${HAVE_GCC} >= 7
+COPTS.dhcp6.c+=                -Wno-error=implicit-fallthrough
+COPTS.if-options.c+=   -Wno-error=implicit-fallthrough
+COPTS.if.c+=           -Wno-error=implicit-fallthrough
+. endif
 .endif
 
 .include <bsd.prog.mk>
diff -r db75c5f7b7a0 -r fdf70e8285fa external/bsd/libarchive/lib/libarchive/Makefile
--- a/external/bsd/libarchive/lib/libarchive/Makefile   Mon Feb 04 03:58:41 2019 +0000
+++ b/external/bsd/libarchive/lib/libarchive/Makefile   Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2018/02/04 03:19:52 christos Exp $
+#      $NetBSD: Makefile,v 1.9 2019/02/04 04:05:15 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -441,4 +441,11 @@
 MLINKS+=       archive_write_set_passphrase.3 archive_write_set_passphrase_callback.3
 MLINKS+=       libarchive.3 archive.3
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
+COPTS.archive_acl.c += -Wno-error=implicit-fallthrough
+COPTS.archive_read.c += -Wno-error=implicit-fallthrough
+COPTS.archive_read_support_format_7zip.c += -Wno-error=implicit-fallthrough
+COPTS.archive_read_support_format_mtree.c += -Wno-error=implicit-fallthrough
+.endif
+
 .include <bsd.lib.mk>
diff -r db75c5f7b7a0 -r fdf70e8285fa external/bsd/libevent/lib/libevent/Makefile
--- a/external/bsd/libevent/lib/libevent/Makefile       Mon Feb 04 03:58:41 2019 +0000
+++ b/external/bsd/libevent/lib/libevent/Makefile       Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/02/22 12:17:16 maya Exp $
+# $NetBSD: Makefile,v 1.5 2019/02/04 04:05:16 mrg Exp $
 
 USE_SHLIBDIR=yes
 .include <bsd.own.mk>
@@ -29,4 +29,10 @@
 select.c \
 signal.c
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
+COPTS.bufferevent_filter.c += -Wno-error=implicit-fallthrough
+COPTS.evdns.c += -Wno-error=implicit-fallthrough
+COPTS.event.c += -Wno-error=implicit-fallthrough
+.endif
+
 .include <bsd.lib.mk>
diff -r db75c5f7b7a0 -r fdf70e8285fa external/bsd/libpcap/lib/Makefile
--- a/external/bsd/libpcap/lib/Makefile Mon Feb 04 03:58:41 2019 +0000
+++ b/external/bsd/libpcap/lib/Makefile Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2018/09/05 17:10:27 christos Exp $  
+# $NetBSD: Makefile,v 1.22 2019/02/04 04:05:16 mrg Exp $       
 
 USE_SHLIBDIR=yes
 .include <bsd.own.mk>
@@ -7,6 +7,10 @@
 CWARNFLAGS.clang+=     -Wno-format-extra-args \
                        -Wno-unneeded-internal-declaration
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.gencode.c+=      -Wno-error=implicit-fallthrough
+.endif
+
 CPPFLAGS+= -DPCAP_DONT_INCLUDE_PCAP_BPF_H -DHAVE_CONFIG_H -I${.OBJDIR}
 
 .SUFFIXES: .3 .3pcap
diff -r db75c5f7b7a0 -r fdf70e8285fa external/bsd/ntp/Makefile.inc
--- a/external/bsd/ntp/Makefile.inc     Mon Feb 04 03:58:41 2019 +0000
+++ b/external/bsd/ntp/Makefile.inc     Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.17 2017/05/21 15:28:39 riastradh Exp $
+#      $NetBSD: Makefile.inc,v 1.18 2019/02/04 04:05:16 mrg Exp $
 
 .if !defined(NTP_MAKEFILE_INC)
 NTP_MAKEFILE_INC=yes
@@ -67,4 +67,11 @@
 .include "${.CURDIR}/../../Makefile.inc"
 .endif
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.configfile.c+=           -Wno-error=implicit-fallthrough
+COPTS.libopts.c+=              -Wno-error=implicit-fallthrough
+COPTS.ntp_loopfilter.c+=       -Wno-error=implicit-fallthrough
+COPTS.refclock_ulink.c+=       -Wno-error=implicit-fallthrough
 .endif
+
+.endif
diff -r db75c5f7b7a0 -r fdf70e8285fa external/bsd/nvi/usr.bin/nvi/Makefile
--- a/external/bsd/nvi/usr.bin/nvi/Makefile     Mon Feb 04 03:58:41 2019 +0000
+++ b/external/bsd/nvi/usr.bin/nvi/Makefile     Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2018/08/07 08:05:48 rin Exp $
+#      $NetBSD: Makefile,v 1.18 2019/02/04 04:05:16 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -18,6 +18,10 @@
 CWARNFLAGS.clang+=     -Wno-unsequenced
 .endif
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.log1.c+=         -Wno-error=implicit-fallthrough
+.endif
+
 CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I.
 CPPFLAGS+=-DGTAGS -DIMCTRL
 CPPFLAGS+=-DHAVE_OPENPTY -DHAVE_UTIL_H
diff -r db75c5f7b7a0 -r fdf70e8285fa external/bsd/pdisk/bin/Makefile
--- a/external/bsd/pdisk/bin/Makefile   Mon Feb 04 03:58:41 2019 +0000
+++ b/external/bsd/pdisk/bin/Makefile   Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2013/03/23 15:42:40 christos Exp $      
+#      $NetBSD: Makefile,v 1.2 2019/02/04 04:05:16 mrg Exp $   
 
 .include <bsd.own.mk>
 WARNS=5
@@ -20,4 +20,10 @@
 
 CPPFLAGS+=     -D__unix__
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.file_media.c+=   -Wno-error=implicit-fallthrough
+COPTS.pathname.c+=     -Wno-error=implicit-fallthrough
+COPTS.pdisk.c+=                -Wno-error=implicit-fallthrough
+.endif
+
 .include <bsd.prog.mk>
diff -r db75c5f7b7a0 -r fdf70e8285fa lib/libbz2/Makefile
--- a/lib/libbz2/Makefile       Mon Feb 04 03:58:41 2019 +0000
+++ b/lib/libbz2/Makefile       Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2014/07/05 19:22:42 dholland Exp $
+#      $NetBSD: Makefile,v 1.19 2019/02/04 04:05:16 mrg Exp $
 
 USE_FORT?= yes # data driven bugs?
 
@@ -20,6 +20,10 @@
 COPTS+=                -O0
 .endif
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS+=                -Wno-error=implicit-fallthrough
+.endif
+
 # XXX blocksort.c gets mis-compiled with 4.1
 .if (${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb") && \
     defined(HAVE_GCC)
diff -r db75c5f7b7a0 -r fdf70e8285fa lib/libz/Makefile
--- a/lib/libz/Makefile Mon Feb 04 03:58:41 2019 +0000
+++ b/lib/libz/Makefile Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.23 2017/01/10 01:28:03 christos Exp $
+#      $NetBSD: Makefile,v 1.24 2019/02/04 04:05:16 mrg Exp $
 
 WARNS= 3
 
@@ -29,6 +29,11 @@
 FILESMODE_zlib.pc=     ${NONBINMODE}
 FILESDIR_zlib.pc=      /usr/lib/pkgconfig
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.infback.c+=      -Wno-error=implicit-fallthrough
+COPTS.inflate.c+=      -Wno-error=implicit-fallthrough
+.endif
+
 .include <bsd.lib.mk>
 
 test: minigzip
diff -r db75c5f7b7a0 -r fdf70e8285fa sys/modules/pf/Makefile
--- a/sys/modules/pf/Makefile   Mon Feb 04 03:58:41 2019 +0000
+++ b/sys/modules/pf/Makefile   Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/02/19 16:21:36 maya Exp $
+# $NetBSD: Makefile,v 1.10 2019/02/04 04:05:16 mrg Exp $
 
 .include "../Makefile.inc"
 
@@ -20,4 +20,8 @@
 
 CPPFLAGS+=     -I${S}/dist/pf -I${S} -DINET6 -DINET
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.pf.c+=   -Wno-error=implicit-fallthrough
+.endif
+
 .include <bsd.kmodule.mk>
diff -r db75c5f7b7a0 -r fdf70e8285fa sys/modules/radeondrm/Makefile
--- a/sys/modules/radeondrm/Makefile    Mon Feb 04 03:58:41 2019 +0000
+++ b/sys/modules/radeondrm/Makefile    Mon Feb 04 04:05:15 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/08/28 15:56:22 jmcneill Exp $
+# $NetBSD: Makefile,v 1.11 2019/02/04 04:05:16 mrg Exp $
 
 .include "../Makefile.inc"
 
@@ -21,4 +21,8 @@
 CPPFLAGS+=     -I${S}/external/bsd/drm/dist/bsd-core \



Home | Main Index | Thread Index | Old Index