summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2019-09-29 23:44:58 +0000
committermrg <mrg@NetBSD.org>2019-09-29 23:44:58 +0000
commit1569c011b51d28c2f219bbdf7281fefeeea0891c (patch)
tree2125d7503b81db3a434346b57a987a80efbb25a2
parentae69ca9eb73a1079739da2f83bad6e93d123c746 (diff)
convert HAVE_GCC == 7 to HAVE_GCC >= 7.
-rw-r--r--bin/ksh/Makefile4
-rw-r--r--crypto/external/bsd/netpgp/bin/netpgpverify/Makefile4
-rw-r--r--crypto/external/bsd/netpgp/lib/verify/Makefile4
-rw-r--r--crypto/external/bsd/openssh/bin/sftp/Makefile4
-rw-r--r--distrib/utils/zcat/Makefile4
-rw-r--r--external/bsd/atf/lib/tools/Makefile4
-rw-r--r--external/bsd/flex/bin/Makefile4
-rw-r--r--external/bsd/ipf/bin/ipf/Makefile4
-rw-r--r--external/bsd/ipf/bin/ipftest/Makefile4
-rw-r--r--external/bsd/ntp/Makefile.inc4
-rw-r--r--external/bsd/pdisk/bin/Makefile4
-rw-r--r--external/bsd/pkg_install/Makefile.inc4
-rw-r--r--games/backgammon/common_source/Makefile4
-rw-r--r--games/hunt/huntd/Makefile4
-rw-r--r--lib/libbz2/Makefile4
-rw-r--r--lib/libz/Makefile4
-rw-r--r--sys/lib/libkern/Makefile.compiler-rt4
-rw-r--r--sys/modules/ath_hal/Makefile4
-rw-r--r--sys/modules/i915drmkms/Makefile4
-rw-r--r--sys/modules/pf/Makefile4
-rw-r--r--sys/modules/radeondrm/Makefile4
-rw-r--r--sys/modules/savagedrm/Makefile4
-rw-r--r--sys/modules/viadrmums/Makefile4
-rw-r--r--sys/modules/zlib/Makefile4
-rw-r--r--sys/rump/kern/lib/libz/Makefile4
-rw-r--r--tests/kernel/Makefile4
-rw-r--r--tests/lib/libc/misc/Makefile4
-rw-r--r--tests/lib/libc/ssp/Makefile4
-rw-r--r--usr.bin/make/Makefile4
-rw-r--r--usr.bin/newsyslog/Makefile4
-rw-r--r--usr.bin/rdist/Makefile4
-rw-r--r--usr.bin/stat/Makefile4
-rw-r--r--usr.bin/systat/Makefile4
-rw-r--r--usr.bin/telnet/Makefile4
-rw-r--r--usr.sbin/quotacheck/Makefile4
-rw-r--r--usr.sbin/sysinst/Makefile.inc6
-rw-r--r--usr.sbin/syslogd/Makefile4
37 files changed, 75 insertions, 75 deletions
diff --git a/bin/ksh/Makefile b/bin/ksh/Makefile
index 892f59b643d..80c1848e483 100644
--- a/bin/ksh/Makefile
+++ b/bin/ksh/Makefile
@@ -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
diff --git a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
index c5081946554..8a99f7badc0 100644
--- a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
+++ b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
@@ -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
diff --git a/crypto/external/bsd/netpgp/lib/verify/Makefile b/crypto/external/bsd/netpgp/lib/verify/Makefile
index 59012e8fa41..a5883564ce5 100644
--- a/crypto/external/bsd/netpgp/lib/verify/Makefile
+++ b/crypto/external/bsd/netpgp/lib/verify/Makefile
@@ -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
diff --git a/crypto/external/bsd/openssh/bin/sftp/Makefile b/crypto/external/bsd/openssh/bin/sftp/Makefile
index 5371f0b619e..dcc351c9e95 100644
--- a/crypto/external/bsd/openssh/bin/sftp/Makefile
+++ b/crypto/external/bsd/openssh/bin/sftp/Makefile
@@ -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
diff --git a/distrib/utils/zcat/Makefile b/distrib/utils/zcat/Makefile
index 96b1016f11e..18605612a7e 100644
--- a/distrib/utils/zcat/Makefile
+++ b/distrib/utils/zcat/Makefile
@@ -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
diff --git a/external/bsd/atf/lib/tools/Makefile b/external/bsd/atf/lib/tools/Makefile
index 38e1ce936ca..54bbfce553d 100644
--- a/external/bsd/atf/lib/tools/Makefile
+++ b/external/bsd/atf/lib/tools/Makefile
@@ -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
diff --git a/external/bsd/flex/bin/Makefile b/external/bsd/flex/bin/Makefile
index 0767d82941e..cfb32978c70 100644
--- a/external/bsd/flex/bin/Makefile
+++ b/external/bsd/flex/bin/Makefile
@@ -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
diff --git a/external/bsd/ipf/bin/ipf/Makefile b/external/bsd/ipf/bin/ipf/Makefile
index f842da29eb4..c42cbdd18dd 100644
--- a/external/bsd/ipf/bin/ipf/Makefile
+++ b/external/bsd/ipf/bin/ipf/Makefile
@@ -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
diff --git a/external/bsd/ipf/bin/ipftest/Makefile b/external/bsd/ipf/bin/ipftest/Makefile
index d4b65e4539d..1427b3fdb71 100644
--- a/external/bsd/ipf/bin/ipftest/Makefile
+++ b/external/bsd/ipf/bin/ipftest/Makefile
@@ -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
diff --git a/external/bsd/ntp/Makefile.inc b/external/bsd/ntp/Makefile.inc
index d0ca8e8ddb5..f1267d68b38 100644
--- a/external/bsd/ntp/Makefile.inc
+++ b/external/bsd/ntp/Makefile.inc
@@ -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
diff --git a/external/bsd/pdisk/bin/Makefile b/external/bsd/pdisk/bin/Makefile
index 9ba61a68082..ecfc5bf7fa0 100644
--- a/external/bsd/pdisk/bin/Makefile
+++ b/external/bsd/pdisk/bin/Makefile
@@ -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
diff --git a/external/bsd/pkg_install/Makefile.inc b/external/bsd/pkg_install/Makefile.inc
index 367b62c26b3..070baae748d 100644
--- a/external/bsd/pkg_install/Makefile.inc
+++ b/external/bsd/pkg_install/Makefile.inc
@@ -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
diff --git a/games/backgammon/common_source/Makefile b/games/backgammon/common_source/Makefile
index f77b337e262..5daf9579e0c 100644
--- a/games/backgammon/common_source/Makefile
+++ b/games/backgammon/common_source/Makefile
@@ -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 init.c odds.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.check.c+= -Wno-error=implicit-fallthrough
.endif
diff --git a/games/hunt/huntd/Makefile b/games/hunt/huntd/Makefile
index 131b7696468..9bce5e39bb0 100644
--- a/games/hunt/huntd/Makefile
+++ b/games/hunt/huntd/Makefile
@@ -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
diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile
index 36e5c4148bd..a7cb39664bc 100644
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@@ -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
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 7c38f5bf72c..ceda52dc788 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -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
diff --git a/sys/lib/libkern/Makefile.compiler-rt b/sys/lib/libkern/Makefile.compiler-rt
index b8d1a6f7827..b06d93bfa9c 100644
--- a/sys/lib/libkern/Makefile.compiler-rt
+++ b/sys/lib/libkern/Makefile.compiler-rt
@@ -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
diff --git a/sys/modules/ath_hal/Makefile b/sys/modules/ath_hal/Makefile
index 0cdc03af2ca..c0717ae0610 100644
--- a/sys/modules/ath_hal/Makefile
+++ b/sys/modules/ath_hal/Makefile
@@ -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
diff --git a/sys/modules/i915drmkms/Makefile b/sys/modules/i915drmkms/Makefile
index c1af8a00879..3fb1abae543 100644
--- a/sys/modules/i915drmkms/Makefile
+++ b/sys/modules/i915drmkms/Makefile
@@ -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
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index 3367de2873b..005f6206b28 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -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 -DINET
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
diff --git a/sys/modules/radeondrm/Makefile b/sys/modules/radeondrm/Makefile
index e1d165f4e7e..01a3760252e 100644
--- a/sys/modules/radeondrm/Makefile
+++ b/sys/modules/radeondrm/Makefile
@@ -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/bsd-core \
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
diff --git a/sys/modules/savagedrm/Makefile b/sys/modules/savagedrm/Makefile
index 299806e8e57..998b5123097 100644
--- a/sys/modules/savagedrm/Makefile
+++ b/sys/modules/savagedrm/Makefile
@@ -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/bsd-core \
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
diff --git a/sys/modules/viadrmums/Makefile b/sys/modules/viadrmums/Makefile
index ecb55103735..22ed8ce1073 100644
--- a/sys/modules/viadrmums/Makefile
+++ b/sys/modules/viadrmums/Makefile
@@ -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
diff --git a/sys/modules/zlib/Makefile b/sys/modules/zlib/Makefile
index 533abb7416a..c721d9f764e 100644
--- a/sys/modules/zlib/Makefile
+++ b/sys/modules/zlib/Makefile
@@ -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
diff --git a/sys/rump/kern/lib/libz/Makefile b/sys/rump/kern/lib/libz/Makefile
index c99d874b875..7963f80e172 100644
--- a/sys/rump/kern/lib/libz/Makefile
+++ b/sys/rump/kern/lib/libz/Makefile
@@ -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
diff --git a/tests/kernel/Makefile b/tests/kernel/Makefile
index a52f2caecb8..c4ec2979df5 100644
--- a/tests/kernel/Makefile
+++ b/tests/kernel/Makefile
@@ -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 ${NETBSDSRCDIR}/sys/kern/subr_prf.c
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
diff --git a/tests/lib/libc/misc/Makefile b/tests/lib/libc/misc/Makefile
index 81234ff9067..cb23872e2f7 100644
--- a/tests/lib/libc/misc/Makefile
+++ b/tests/lib/libc/misc/Makefile
@@ -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-completeness
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
diff --git a/tests/lib/libc/ssp/Makefile b/tests/lib/libc/ssp/Makefile
index a83548cd64f..0f3acf70aad 100644
--- a/tests/lib/libc/ssp/Makefile
+++ b/tests/lib/libc/ssp/Makefile
@@ -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
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 4f118ab31b5..76da29aa40e 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -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
diff --git a/usr.bin/newsyslog/Makefile b/usr.bin/newsyslog/Makefile
index 02ecc92fdcb..d67c236d088 100644
--- a/usr.bin/newsyslog/Makefile
+++ b/usr.bin/newsyslog/Makefile
@@ -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
diff --git a/usr.bin/rdist/Makefile b/usr.bin/rdist/Makefile
index 2929167d527..fe431cbbd7b 100644
--- a/usr.bin/rdist/Makefile
+++ b/usr.bin/rdist/Makefile
@@ -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 main.c server.c
.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
diff --git a/usr.bin/stat/Makefile b/usr.bin/stat/Makefile
index 47906e4511b..55c85abb799 100644
--- a/usr.bin/stat/Makefile
+++ b/usr.bin/stat/Makefile
@@ -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
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 6fccd971839..d8aad6e3cfd 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -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
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index f5494cca947..b536323b3ee 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -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
diff --git a/usr.sbin/quotacheck/Makefile b/usr.sbin/quotacheck/Makefile
index a265c4ef532..e48885ffb85 100644
--- a/usr.sbin/quotacheck/Makefile
+++ b/usr.sbin/quotacheck/Makefile
@@ -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
diff --git a/usr.sbin/sysinst/Makefile.inc b/usr.sbin/sysinst/Makefile.inc
index e6fb68ea3b3..2cacd35939a 100644
--- a/usr.sbin/sysinst/Makefile.inc
+++ b/usr.sbin/sysinst/Makefile.inc
@@ -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
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index f5fd83cc5ab..4d52764f156 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -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