Module Name: src
Committed By: mrg
Date: Mon Feb 4 04:05:16 UTC 2019
Modified Files:
src/bin/ksh: Makefile
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/lib/verify: Makefile
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
src/external/bsd/libarchive/lib/libarchive: Makefile
src/external/bsd/libevent/lib/libevent: Makefile
src/external/bsd/libpcap/lib: Makefile
src/external/bsd/ntp: Makefile.inc
src/external/bsd/nvi/usr.bin/nvi: Makefile
src/external/bsd/pdisk/bin: Makefile
src/lib/libbz2: Makefile
src/lib/libz: Makefile
src/sys/modules/pf: Makefile
src/sys/modules/radeondrm: Makefile
Log Message:
- use -Wno-error=implicit-fallthrough with GCC7.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/bin/ksh/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/netpgp/lib/verify/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.43 -r1.44 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libarchive/lib/libarchive/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libevent/lib/libevent/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/libpcap/lib/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/nvi/usr.bin/nvi/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/pdisk/bin/Makefile
cvs rdiff -u -r1.18 -r1.19 src/lib/libbz2/Makefile
cvs rdiff -u -r1.23 -r1.24 src/lib/libz/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/pf/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/modules/radeondrm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/Makefile
diff -u src/bin/ksh/Makefile:1.34 src/bin/ksh/Makefile:1.35
--- src/bin/ksh/Makefile:1.34 Fri Jun 30 04:22:22 2017
+++ src/bin/ksh/Makefile Mon Feb 4 04:05:15 2019
@@ -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 @@ ksh.1: ksh.Man mkman
${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>
Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.15 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.16
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.15 Mon Apr 17 19:50:27 2017
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Mon Feb 4 04:05:15 2019
@@ -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 @@ EXTDIST=${.CURDIR}/../../dist
.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}
Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.9 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.10
--- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.9 Mon Apr 17 19:50:28 2017
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile Mon Feb 4 04:05:15 2019
@@ -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 @@ EXTDIST=${.CURDIR}/../../dist
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>
Index: src/crypto/external/bsd/openssh/bin/sftp/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.5 src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.6
--- src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.5 Fri Aug 10 12:20:11 2012
+++ src/crypto/external/bsd/openssh/bin/sftp/Makefile Mon Feb 4 04:05:15 2019
@@ -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 @@ DPADD+= ${LIBEDIT} ${LIBTERMINFO}
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>
Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.43 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.44
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.43 Fri Feb 2 01:02:39 2018
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Mon Feb 4 04:05:15 2019
@@ -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 @@ ${f}: ${f}.in
${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>
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.8 src/external/bsd/libarchive/lib/libarchive/Makefile:1.9
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.8 Sun Feb 4 03:19:52 2018
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Mon Feb 4 04:05:15 2019
@@ -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_options.3 arc
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>
Index: src/external/bsd/libevent/lib/libevent/Makefile
diff -u src/external/bsd/libevent/lib/libevent/Makefile:1.4 src/external/bsd/libevent/lib/libevent/Makefile:1.5
--- src/external/bsd/libevent/lib/libevent/Makefile:1.4 Wed Feb 22 12:17:16 2017
+++ src/external/bsd/libevent/lib/libevent/Makefile Mon Feb 4 04:05:16 2019
@@ -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 @@ poll.c \
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>
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.21 src/external/bsd/libpcap/lib/Makefile:1.22
--- src/external/bsd/libpcap/lib/Makefile:1.21 Wed Sep 5 17:10:27 2018
+++ src/external/bsd/libpcap/lib/Makefile Mon Feb 4 04:05:16 2019
@@ -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 @@ USE_FORT?= yes # network protocol librar
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
Index: src/external/bsd/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.17 src/external/bsd/ntp/Makefile.inc:1.18
--- src/external/bsd/ntp/Makefile.inc:1.17 Sun May 21 15:28:39 2017
+++ src/external/bsd/ntp/Makefile.inc Mon Feb 4 04:05:16 2019
@@ -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 @@ CPPFLAGS+=-DISC_PLATFORM_NEEDIN6ADDRANY
.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
Index: src/external/bsd/nvi/usr.bin/nvi/Makefile
diff -u src/external/bsd/nvi/usr.bin/nvi/Makefile:1.17 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.18
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.17 Tue Aug 7 08:05:48 2018
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Mon Feb 4 04:05:16 2019
@@ -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.gcc+= -Wno-unused
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
Index: src/external/bsd/pdisk/bin/Makefile
diff -u src/external/bsd/pdisk/bin/Makefile:1.1 src/external/bsd/pdisk/bin/Makefile:1.2
--- src/external/bsd/pdisk/bin/Makefile:1.1 Sat Mar 23 15:42:40 2013
+++ src/external/bsd/pdisk/bin/Makefile Mon Feb 4 04:05:16 2019
@@ -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+= -I${SRCDIR}
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>
Index: src/lib/libbz2/Makefile
diff -u src/lib/libbz2/Makefile:1.18 src/lib/libbz2/Makefile:1.19
--- src/lib/libbz2/Makefile:1.18 Sat Jul 5 19:22:42 2014
+++ src/lib/libbz2/Makefile Mon Feb 4 04:05:16 2019
@@ -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 @@ INCSDIR= /usr/include
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)
Index: src/lib/libz/Makefile
diff -u src/lib/libz/Makefile:1.23 src/lib/libz/Makefile:1.24
--- src/lib/libz/Makefile:1.23 Tue Jan 10 01:28:03 2017
+++ src/lib/libz/Makefile Mon Feb 4 04:05:16 2019
@@ -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 @@ FILESGRP_zlib.pc= ${BINGRP}
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
Index: src/sys/modules/pf/Makefile
diff -u src/sys/modules/pf/Makefile:1.9 src/sys/modules/pf/Makefile:1.10
--- src/sys/modules/pf/Makefile:1.9 Mon Feb 19 16:21:36 2018
+++ src/sys/modules/pf/Makefile Mon Feb 4 04:05:16 2019
@@ -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 @@ SRCS+= tcp_rndiss.c
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>
Index: src/sys/modules/radeondrm/Makefile
diff -u src/sys/modules/radeondrm/Makefile:1.10 src/sys/modules/radeondrm/Makefile:1.11
--- src/sys/modules/radeondrm/Makefile:1.10 Sun Aug 28 15:56:22 2011
+++ src/sys/modules/radeondrm/Makefile Mon Feb 4 04:05:16 2019
@@ -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 @@ SRCS+= radeon_state.c
CPPFLAGS+= -I${S}/external/bsd/drm/dist/bsd-core \
-I${S}/external/bsd/drm/dist/shared-core
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.radeon_cs.c+= -Wno-error=implicit-fallthrough
+.endif
+
.include <bsd.kmodule.mk>
