Module Name: src
Committed By: mrg
Date: Sun Sep 29 23:45:02 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/distrib/utils/zcat: Makefile
src/external/bsd/atf/lib/tools: Makefile
src/external/bsd/flex/bin: Makefile
src/external/bsd/ipf/bin/ipf: Makefile
src/external/bsd/ipf/bin/ipftest: Makefile
src/external/bsd/ntp: Makefile.inc
src/external/bsd/pdisk/bin: Makefile
src/external/bsd/pkg_install: Makefile.inc
src/games/backgammon/common_source: Makefile
src/games/hunt/huntd: Makefile
src/lib/libbz2: Makefile
src/lib/libz: Makefile
src/sys/lib/libkern: Makefile.compiler-rt
src/sys/modules/ath_hal: Makefile
src/sys/modules/i915drmkms: Makefile
src/sys/modules/pf: Makefile
src/sys/modules/radeondrm: Makefile
src/sys/modules/savagedrm: Makefile
src/sys/modules/viadrmums: Makefile
src/sys/modules/zlib: Makefile
src/sys/rump/kern/lib/libz: Makefile
src/tests/kernel: Makefile
src/tests/lib/libc/misc: Makefile
src/tests/lib/libc/ssp: Makefile
src/usr.bin/make: Makefile
src/usr.bin/newsyslog: Makefile
src/usr.bin/rdist: Makefile
src/usr.bin/stat: Makefile
src/usr.bin/systat: Makefile
src/usr.bin/telnet: Makefile
src/usr.sbin/quotacheck: Makefile
src/usr.sbin/sysinst: Makefile.inc
src/usr.sbin/syslogd: Makefile
Log Message:
convert HAVE_GCC == 7 to HAVE_GCC >= 7.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/bin/ksh/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/netpgp/lib/verify/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/zcat/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/lib/tools/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/flex/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/bin/ipf/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ipf/bin/ipftest/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pdisk/bin/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/Makefile.inc
cvs rdiff -u -r1.10 -r1.11 src/games/backgammon/common_source/Makefile
cvs rdiff -u -r1.7 -r1.8 src/games/hunt/huntd/Makefile
cvs rdiff -u -r1.19 -r1.20 src/lib/libbz2/Makefile
cvs rdiff -u -r1.24 -r1.25 src/lib/libz/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/lib/libkern/Makefile.compiler-rt
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/ath_hal/Makefile
cvs rdiff -u -r1.13 -r1.14 src/sys/modules/i915drmkms/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/modules/pf/Makefile
cvs rdiff -u -r1.12 -r1.13 src/sys/modules/radeondrm/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/savagedrm/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/viadrmums/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/zlib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/kern/lib/libz/Makefile
cvs rdiff -u -r1.63 -r1.64 src/tests/kernel/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/misc/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tests/lib/libc/ssp/Makefile
cvs rdiff -u -r1.61 -r1.62 src/usr.bin/make/Makefile
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/newsyslog/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/rdist/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/stat/Makefile
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/systat/Makefile
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/telnet/Makefile
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/quotacheck/Makefile
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/syslogd/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.35 src/bin/ksh/Makefile:1.36
--- src/bin/ksh/Makefile:1.35 Mon Feb 4 04:05:15 2019
+++ src/bin/ksh/Makefile Sun Sep 29 23:44:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/02/04 04:05:15 mrg Exp $
+# $NetBSD: Makefile,v 1.36 2019/09/29 23:44:58 mrg Exp $
WARNS=3
CWARNFLAGS.clang+= -Wno-error=cast-qual
@@ -48,7 +48,7 @@ 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"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS+= -Wno-error=implicit-fallthrough
.endif
Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.16 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.17
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.16 Mon Feb 4 04:05:15 2019
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Sun Sep 29 23:44:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/02/04 04:05:15 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2019/09/29 23:44:58 mrg Exp $
PROG=netpgpverify
BINDIR= /usr/bin
@@ -28,7 +28,7 @@ EXTDIST=${.CURDIR}/../../dist
.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS+= -Wno-error=implicit-fallthrough
.endif
Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.10 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.11
--- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.10 Mon Feb 4 04:05:15 2019
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile Sun Sep 29 23:44:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/02/04 04:05:15 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2019/09/29 23:44:58 mrg Exp $
LIB=netpgpverify
SRCS+=b64.c
@@ -27,7 +27,7 @@ INCSDIR=/usr/include/netpgp
.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS+= -Wno-error=implicit-fallthrough
.endif
Index: src/crypto/external/bsd/openssh/bin/sftp/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.6 src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.7
--- src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.6 Mon Feb 4 04:05:15 2019
+++ src/crypto/external/bsd/openssh/bin/sftp/Makefile Sun Sep 29 23:44:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/02/04 04:05:15 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2019/09/29 23:44:58 mrg Exp $
BINDIR= /usr/bin
@@ -14,7 +14,7 @@ COPTS.sftp-client.c+= -Wno-pointer-sign
.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.sftp.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/distrib/utils/zcat/Makefile
diff -u src/distrib/utils/zcat/Makefile:1.18 src/distrib/utils/zcat/Makefile:1.19
--- src/distrib/utils/zcat/Makefile:1.18 Wed Feb 6 09:17:18 2019
+++ src/distrib/utils/zcat/Makefile Sun Sep 29 23:44:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/02/06 09:17:18 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2019/09/29 23:44:58 mrg Exp $
# Small zcat (i.e. for install media)
#
@@ -26,7 +26,7 @@ CPPFLAGS+= -I${LIBC}/include
CPPFLAGS+= -Dsnprintf=snprintf_ss -Dsprintf=sprintf_ss
CPPFLAGS+= -Dstrerror=strerror_ss
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.inflate.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/external/bsd/atf/lib/tools/Makefile
diff -u src/external/bsd/atf/lib/tools/Makefile:1.6 src/external/bsd/atf/lib/tools/Makefile:1.7
--- src/external/bsd/atf/lib/tools/Makefile:1.6 Mon Feb 4 09:40:54 2019
+++ src/external/bsd/atf/lib/tools/Makefile Sun Sep 29 23:44:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/02/04 09:40:54 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2019/09/29 23:44:58 mrg Exp $
NOLINT= # defined
@@ -36,7 +36,7 @@ SRCS= application.cpp \
ui.cpp \
user.cpp
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.parser.cpp += -Wno-error=maybe-uninitialized
.endif
Index: src/external/bsd/flex/bin/Makefile
diff -u src/external/bsd/flex/bin/Makefile:1.13 src/external/bsd/flex/bin/Makefile:1.14
--- src/external/bsd/flex/bin/Makefile:1.13 Tue Feb 5 07:47:15 2019
+++ src/external/bsd/flex/bin/Makefile Sun Sep 29 23:44:58 2019
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.4 (Berkeley) 6/24/90
-# $NetBSD: Makefile,v 1.13 2019/02/05 07:47:15 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2019/09/29 23:44:58 mrg Exp $
#
# By default, flex will be configured to generate 8-bit scanners only if the
# -8 flag is given. If you want it to always generate 8-bit scanners, add
@@ -72,7 +72,7 @@ scan.c: scan.l
scan.o yylex.o: parse.h
# Ugh. Generates too large offsets with -O2.
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
. if ${MACHINE_CPU} == "m68k" && empty(CFLAGS:M-O0)
COPTS.scan.c+= -O1
. endif
Index: src/external/bsd/ipf/bin/ipf/Makefile
diff -u src/external/bsd/ipf/bin/ipf/Makefile:1.2 src/external/bsd/ipf/bin/ipf/Makefile:1.3
--- src/external/bsd/ipf/bin/ipf/Makefile:1.2 Tue Feb 5 08:08:59 2019
+++ src/external/bsd/ipf/bin/ipf/Makefile Sun Sep 29 23:44:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/02/05 08:08:59 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/29 23:44:58 mrg Exp $
.include <bsd.own.mk> # for MKDYNAMICROOT definition
@@ -42,7 +42,7 @@ LDSTATIC?= -static
.endif
# Ugh. Generates too large offsets with -O2.
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
. if ${MACHINE_CPU} == "m68k" && empty(CFLAGS:M-O0)
COPTS.ipf_y.c+= -O1
. endif
Index: src/external/bsd/ipf/bin/ipftest/Makefile
diff -u src/external/bsd/ipf/bin/ipftest/Makefile:1.5 src/external/bsd/ipf/bin/ipftest/Makefile:1.6
--- src/external/bsd/ipf/bin/ipftest/Makefile:1.5 Tue Feb 5 08:08:59 2019
+++ src/external/bsd/ipf/bin/ipftest/Makefile Sun Sep 29 23:44:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/02/05 08:08:59 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2019/09/29 23:44:58 mrg Exp $
.include <bsd.own.mk>
@@ -103,7 +103,7 @@ ipf_l.h: lexer.h
${.ALLSRC} > ${.TARGET}
# Ugh. Generates too large offsets with -O2.
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
. if ${MACHINE_CPU} == "m68k" && empty(CFLAGS:M-O0)
COPTS.ipf_y.c+= -O1
. endif
Index: src/external/bsd/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.18 src/external/bsd/ntp/Makefile.inc:1.19
--- src/external/bsd/ntp/Makefile.inc:1.18 Mon Feb 4 04:05:16 2019
+++ src/external/bsd/ntp/Makefile.inc Sun Sep 29 23:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2019/02/04 04:05:16 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.19 2019/09/29 23:44:59 mrg Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -67,7 +67,7 @@ CPPFLAGS+=-DISC_PLATFORM_NEEDIN6ADDRANY
.include "${.CURDIR}/../../Makefile.inc"
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.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
Index: src/external/bsd/pdisk/bin/Makefile
diff -u src/external/bsd/pdisk/bin/Makefile:1.2 src/external/bsd/pdisk/bin/Makefile:1.3
--- src/external/bsd/pdisk/bin/Makefile:1.2 Mon Feb 4 04:05:16 2019
+++ src/external/bsd/pdisk/bin/Makefile Sun Sep 29 23:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/02/04 04:05:16 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/29 23:44:59 mrg Exp $
.include <bsd.own.mk>
WARNS=5
@@ -20,7 +20,7 @@ CPPFLAGS+= -I${SRCDIR}
CPPFLAGS+= -D__unix__
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.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
Index: src/external/bsd/pkg_install/Makefile.inc
diff -u src/external/bsd/pkg_install/Makefile.inc:1.6 src/external/bsd/pkg_install/Makefile.inc:1.7
--- src/external/bsd/pkg_install/Makefile.inc:1.6 Thu Feb 7 23:53:20 2019
+++ src/external/bsd/pkg_install/Makefile.inc Sun Sep 29 23:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2019/02/07 23:53:20 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2019/09/29 23:44:59 mrg Exp $
DIST= ${NETBSDSRCDIR}/external/bsd/pkg_install/dist
@@ -15,7 +15,7 @@ CWARNFLAGS+= -Wno-missing-noreturn
.include <bsd.own.mk>
# show_version() does not return
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.main.c+= -Wno-error=implicit-fallthrough
COPTS.pkg_delete.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/games/backgammon/common_source/Makefile
diff -u src/games/backgammon/common_source/Makefile:1.10 src/games/backgammon/common_source/Makefile:1.11
--- src/games/backgammon/common_source/Makefile:1.10 Mon Feb 4 09:51:48 2019
+++ src/games/backgammon/common_source/Makefile Sun Sep 29 23:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/02/04 09:51:48 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2019/09/29 23:44:59 mrg Exp $
LIBISPRIVATE= yes
@@ -9,7 +9,7 @@ SRCS= allow.c board.c check.c fancy.c i
.include <bsd.own.mk>
# Has fallthru comment that is missed
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.check.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/games/hunt/huntd/Makefile
diff -u src/games/hunt/huntd/Makefile:1.7 src/games/hunt/huntd/Makefile:1.8
--- src/games/hunt/huntd/Makefile:1.7 Mon Feb 4 09:51:48 2019
+++ src/games/hunt/huntd/Makefile Sun Sep 29 23:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/02/04 09:51:48 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2019/09/29 23:44:59 mrg Exp $
PROG= huntd
SRCS= answer.c draw.c driver.c execute.c expl.c \
@@ -10,7 +10,7 @@ CPPFLAGS+=-I${.CURDIR}/../include
.include <bsd.own.mk>
# Has fallthru comment that is missed
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.shots.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/lib/libbz2/Makefile
diff -u src/lib/libbz2/Makefile:1.19 src/lib/libbz2/Makefile:1.20
--- src/lib/libbz2/Makefile:1.19 Mon Feb 4 04:05:16 2019
+++ src/lib/libbz2/Makefile Sun Sep 29 23:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/02/04 04:05:16 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2019/09/29 23:44:59 mrg Exp $
USE_FORT?= yes # data driven bugs?
@@ -20,7 +20,7 @@ INCSDIR= /usr/include
COPTS+= -O0
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS+= -Wno-error=implicit-fallthrough
.endif
Index: src/lib/libz/Makefile
diff -u src/lib/libz/Makefile:1.24 src/lib/libz/Makefile:1.25
--- src/lib/libz/Makefile:1.24 Mon Feb 4 04:05:16 2019
+++ src/lib/libz/Makefile Sun Sep 29 23:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/02/04 04:05:16 mrg Exp $
+# $NetBSD: Makefile,v 1.25 2019/09/29 23:44:59 mrg Exp $
WARNS= 3
@@ -29,7 +29,7 @@ FILESGRP_zlib.pc= ${BINGRP}
FILESMODE_zlib.pc= ${NONBINMODE}
FILESDIR_zlib.pc= /usr/lib/pkgconfig
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.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
Index: src/sys/lib/libkern/Makefile.compiler-rt
diff -u src/sys/lib/libkern/Makefile.compiler-rt:1.9 src/sys/lib/libkern/Makefile.compiler-rt:1.10
--- src/sys/lib/libkern/Makefile.compiler-rt:1.9 Fri Apr 5 14:00:16 2019
+++ src/sys/lib/libkern/Makefile.compiler-rt Sun Sep 29 23:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.compiler-rt,v 1.9 2019/04/05 14:00:16 thorpej Exp $
+# $NetBSD: Makefile.compiler-rt,v 1.10 2019/09/29 23:44:59 mrg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -128,7 +128,7 @@ COPTS.${src}+= -Wno-missing-prototypes \
CPPFLAGS.int_util.c+= -DKERNEL_USE
# XXX Explicit divide by zero in udivmoddi4.c -> abort().
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
. if ${MACHINE_CPU} != "arm"
COPTS.udivmoddi4.c+= -fnon-call-exceptions
. endif
Index: src/sys/modules/ath_hal/Makefile
diff -u src/sys/modules/ath_hal/Makefile:1.5 src/sys/modules/ath_hal/Makefile:1.6
--- src/sys/modules/ath_hal/Makefile:1.5 Mon Feb 4 08:36:43 2019
+++ src/sys/modules/ath_hal/Makefile Sun Sep 29 23:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/02/04 08:36:43 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2019/09/29 23:44:59 mrg Exp $
.include "../Makefile.inc"
@@ -96,7 +96,7 @@ SRCS+= ar2133.c \
.include "Makefile.inc"
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.ar5212_xmit.c+= -Wno-error=implicit-fallthrough
COPTS.ar5416_xmit.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/sys/modules/i915drmkms/Makefile
diff -u src/sys/modules/i915drmkms/Makefile:1.13 src/sys/modules/i915drmkms/Makefile:1.14
--- src/sys/modules/i915drmkms/Makefile:1.13 Sun Feb 17 04:05:50 2019
+++ src/sys/modules/i915drmkms/Makefile Sun Sep 29 23:45:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/02/17 04:05:50 rin Exp $
+# $NetBSD: Makefile,v 1.14 2019/09/29 23:45:00 mrg Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -114,7 +114,7 @@ SRCS+= intel_uncore.c
WARNS= 3
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.intel_display.c+= -Wno-error=implicit-fallthrough
COPTS.intel_ddi.c+= -Wno-error=implicit-fallthrough
COPTS.intel_sdvo.c+= -Wno-error=implicit-fallthrough
Index: src/sys/modules/pf/Makefile
diff -u src/sys/modules/pf/Makefile:1.11 src/sys/modules/pf/Makefile:1.12
--- src/sys/modules/pf/Makefile:1.11 Sun Feb 17 04:05:56 2019
+++ src/sys/modules/pf/Makefile Sun Sep 29 23:45:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/02/17 04:05:56 rin Exp $
+# $NetBSD: Makefile,v 1.12 2019/09/29 23:45:00 mrg Exp $
.include "../Makefile.inc"
@@ -22,7 +22,7 @@ CPPFLAGS+= -I${S}/dist/pf -I${S} -DINET6
WARNS= 3
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.pf.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/sys/modules/radeondrm/Makefile
diff -u src/sys/modules/radeondrm/Makefile:1.12 src/sys/modules/radeondrm/Makefile:1.13
--- src/sys/modules/radeondrm/Makefile:1.12 Sun Feb 17 04:05:57 2019
+++ src/sys/modules/radeondrm/Makefile Sun Sep 29 23:45:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/02/17 04:05:57 rin Exp $
+# $NetBSD: Makefile,v 1.13 2019/09/29 23:45:00 mrg Exp $
.include "../Makefile.inc"
@@ -23,7 +23,7 @@ CPPFLAGS+= -I${S}/external/bsd/drm/dist/
WARNS= 3
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.radeon_cs.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/sys/modules/savagedrm/Makefile
diff -u src/sys/modules/savagedrm/Makefile:1.3 src/sys/modules/savagedrm/Makefile:1.4
--- src/sys/modules/savagedrm/Makefile:1.3 Sun Feb 17 04:05:57 2019
+++ src/sys/modules/savagedrm/Makefile Sun Sep 29 23:45:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/02/17 04:05:57 rin Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/29 23:45:00 mrg Exp $
.include "../Makefile.inc"
@@ -17,7 +17,7 @@ CPPFLAGS+= -I${S}/external/bsd/drm/dist/
WARNS= 3
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.savage_state.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/sys/modules/viadrmums/Makefile
diff -u src/sys/modules/viadrmums/Makefile:1.3 src/sys/modules/viadrmums/Makefile:1.4
--- src/sys/modules/viadrmums/Makefile:1.3 Sun Feb 17 04:06:00 2019
+++ src/sys/modules/viadrmums/Makefile Sun Sep 29 23:45:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/02/17 04:06:00 rin Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/29 23:45:00 mrg Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -29,7 +29,7 @@ SRCS+= via_pci.c
WARNS= 3
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.via_dmablit.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/sys/modules/zlib/Makefile
diff -u src/sys/modules/zlib/Makefile:1.3 src/sys/modules/zlib/Makefile:1.4
--- src/sys/modules/zlib/Makefile:1.3 Sun Feb 17 04:06:01 2019
+++ src/sys/modules/zlib/Makefile Sun Sep 29 23:45:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/02/17 04:06:01 rin Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/29 23:45:00 mrg Exp $
.include "../Makefile.inc"
@@ -9,7 +9,7 @@ SRCS= zlib.c
WARNS= 3
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.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.3 src/sys/rump/kern/lib/libz/Makefile:1.4
--- src/sys/rump/kern/lib/libz/Makefile:1.3 Tue Feb 5 09:29:20 2019
+++ src/sys/rump/kern/lib/libz/Makefile Sun Sep 29 23:45:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/02/05 09:29:20 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/29 23:45:00 mrg Exp $
#
# zlib.c is logically in sys/net
@@ -12,6 +12,6 @@ SRCS= zlib.c
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.zlib.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.63 src/tests/kernel/Makefile:1.64
--- src/tests/kernel/Makefile:1.63 Sun Sep 15 16:53:58 2019
+++ src/tests/kernel/Makefile Sun Sep 29 23:45:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2019/09/15 16:53:58 christos Exp $
+# $NetBSD: Makefile,v 1.64 2019/09/29 23:45:00 mrg Exp $
NOMAN= # defined
@@ -76,7 +76,7 @@ t_subr_prf.c: gen_t_subr_prf ${NETBSDSRC
CPPFLAGS.t_subr_prf.c= -Wno-pointer-sign # XXX platform vs kernel SHA2
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
# Test explicitly tests failure modes.
CPPFLAGS.t_subr_prf.c+= -Wno-error=format-truncation
.endif
Index: src/tests/lib/libc/misc/Makefile
diff -u src/tests/lib/libc/misc/Makefile:1.4 src/tests/lib/libc/misc/Makefile:1.5
--- src/tests/lib/libc/misc/Makefile:1.4 Thu Aug 15 08:17:32 2019
+++ src/tests/lib/libc/misc/Makefile Sun Sep 29 23:45:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/08/15 08:17:32 kamil Exp $
+# $NetBSD: Makefile,v 1.5 2019/09/29 23:45:00 mrg Exp $
.include <bsd.own.mk>
@@ -29,7 +29,7 @@ CWARNFLAGS.clang+= -Wno-nullability-comp
COPTS.t_ubsan.c += -Wno-stack-protector
COPTS.t_ubsanxx.cpp += -Wno-stack-protector
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.t_ubsan.c+= -Wno-int-in-bool-context
COPTS.t_ubsanxx.cpp+= -Wno-int-in-bool-context
.endif
Index: src/tests/lib/libc/ssp/Makefile
diff -u src/tests/lib/libc/ssp/Makefile:1.8 src/tests/lib/libc/ssp/Makefile:1.9
--- src/tests/lib/libc/ssp/Makefile:1.8 Mon Feb 4 05:24:18 2019
+++ src/tests/lib/libc/ssp/Makefile Sun Sep 29 23:45:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/02/04 05:24:18 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2019/09/29 23:45:01 mrg Exp $
NOMAN= # defined
@@ -48,7 +48,7 @@ PROGS+= h_strncpy
PROGS+= h_vsnprintf
PROGS+= h_vsprintf
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
# Test exercises truncation
COPTS.h_snprintf.c+= -Wno-error=format-truncation
.endif
Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.61 src/usr.bin/make/Makefile:1.62
--- src/usr.bin/make/Makefile:1.61 Mon Feb 4 03:58:41 2019
+++ src/usr.bin/make/Makefile Sun Sep 29 23:45:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2019/02/04 03:58:41 mrg Exp $
+# $NetBSD: Makefile,v 1.62 2019/09/29 23:45:01 mrg Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -46,7 +46,7 @@ LDADD+=-lutil
DPADD+=${LIBUTIL}
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.arch.c += -Wno-error=format-truncation
.endif
Index: src/usr.bin/newsyslog/Makefile
diff -u src/usr.bin/newsyslog/Makefile:1.19 src/usr.bin/newsyslog/Makefile:1.20
--- src/usr.bin/newsyslog/Makefile:1.19 Mon Feb 4 03:58:41 2019
+++ src/usr.bin/newsyslog/Makefile Sun Sep 29 23:45:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/02/04 03:58:41 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2019/09/29 23:45:01 mrg Exp $
PROG= newsyslog
SRCS= newsyslog.c
@@ -8,7 +8,7 @@ MLINKS+=newsyslog.8 newsyslog.conf.5
.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.newsyslog.c += -Wno-error=format-truncation
.endif
Index: src/usr.bin/rdist/Makefile
diff -u src/usr.bin/rdist/Makefile:1.12 src/usr.bin/rdist/Makefile:1.13
--- src/usr.bin/rdist/Makefile:1.12 Mon Feb 4 03:58:41 2019
+++ src/usr.bin/rdist/Makefile Sun Sep 29 23:45:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/02/04 03:58:41 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2019/09/29 23:45:01 mrg Exp $
# from: @(#)Makefile 8.3 (Berkeley) 7/19/93
USE_FORT?= yes # network client/server
@@ -9,7 +9,7 @@ SRCS= docmd.c expand.c gram.y lookup.c m
.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.server.c += -Wno-error=format-truncation
.endif
Index: src/usr.bin/stat/Makefile
diff -u src/usr.bin/stat/Makefile:1.10 src/usr.bin/stat/Makefile:1.11
--- src/usr.bin/stat/Makefile:1.10 Mon Feb 4 10:03:16 2019
+++ src/usr.bin/stat/Makefile Sun Sep 29 23:45:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/02/04 10:03:16 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2019/09/29 23:45:01 mrg Exp $
PROG= stat
@@ -10,7 +10,7 @@ MLINKS= stat.1 readlink.1
.include <bsd.own.mk>
# Has fallthru comment that is missed
-.if !defined(HOSTPROG) && defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if !defined(HOSTPROG) && defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.stat.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/usr.bin/systat/Makefile
diff -u src/usr.bin/systat/Makefile:1.41 src/usr.bin/systat/Makefile:1.42
--- src/usr.bin/systat/Makefile:1.41 Mon Feb 4 03:58:41 2019
+++ src/usr.bin/systat/Makefile Sun Sep 29 23:45:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/02/04 03:58:41 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2019/09/29 23:45:01 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -29,7 +29,7 @@ SRCS+= ip6.c
.include "../../compat/exec.mk"
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.df.c += -Wno-error=format-truncation
.endif
Index: src/usr.bin/telnet/Makefile
diff -u src/usr.bin/telnet/Makefile:1.57 src/usr.bin/telnet/Makefile:1.58
--- src/usr.bin/telnet/Makefile:1.57 Mon Feb 4 09:51:47 2019
+++ src/usr.bin/telnet/Makefile Sun Sep 29 23:45:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2019/02/04 09:51:47 mrg Exp $
+# $NetBSD: Makefile,v 1.58 2019/09/29 23:45:01 mrg Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@@ -78,7 +78,7 @@ COPTS.${f}.c+= -Wno-pointer-sign
.endfor
# Has fallthru comment that is missed
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.telnet.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/usr.sbin/quotacheck/Makefile
diff -u src/usr.sbin/quotacheck/Makefile:1.20 src/usr.sbin/quotacheck/Makefile:1.21
--- src/usr.sbin/quotacheck/Makefile:1.20 Mon Feb 4 09:51:48 2019
+++ src/usr.sbin/quotacheck/Makefile Sun Sep 29 23:45:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/02/04 09:51:48 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2019/09/29 23:45:01 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ SRCS+= quotautil.c
.include <bsd.own.mk>
# Has fallthru comment that is missed
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.quotacheck.c+= -Wno-error=implicit-fallthrough
.endif
Index: src/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.22 src/usr.sbin/sysinst/Makefile.inc:1.23
--- src/usr.sbin/sysinst/Makefile.inc:1.22 Thu Jun 20 15:59:40 2019
+++ src/usr.sbin/sysinst/Makefile.inc Sun Sep 29 23:45:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2019/06/20 15:59:40 christos Exp $
+# $NetBSD: Makefile.inc,v 1.23 2019/09/29 23:45:02 mrg Exp $
#
# Makefile for sysinst
@@ -122,8 +122,8 @@ COPTS += -Os
CPPFLAGS+=-DINET6
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
-COPTS+=-Wno-format-truncation # most useless gcc warning ever
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
+COPTS+=-Wno-format-truncation
.endif
Index: src/usr.sbin/syslogd/Makefile
diff -u src/usr.sbin/syslogd/Makefile:1.28 src/usr.sbin/syslogd/Makefile:1.29
--- src/usr.sbin/syslogd/Makefile:1.28 Mon Feb 4 10:22:15 2019
+++ src/usr.sbin/syslogd/Makefile Sun Sep 29 23:45:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/02/04 10:22:15 mrg Exp $
+# $NetBSD: Makefile,v 1.29 2019/09/29 23:45:02 mrg Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -31,7 +31,7 @@ DPADD+= ${LIBWRAP}
LDADD+= -lssl -lcrypto
# Overflow that appears impossible
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.syslogd.c+= -Wno-error=format-truncation
.endif
