summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2023-06-03 21:30:20 +0000
committerlukem <lukem@NetBSD.org>2023-06-03 21:30:20 +0000
commitbf78d24f392cabe409a8996d69a3aa31cfa05bf5 (patch)
tree2918bee2f5c43e69cf1466373a63dce5c843ba82
parente0afa30fb1d93c0343ecc354a6d6f67358e262cd (diff)
adapt to ${CC_WNO_IMPLICIT_FALLTHROUGH}
Use ${CC_WNO_IMPLICIT_FALLTHROUGH} instead of the older style more complex expressions.
-rw-r--r--bin/ksh/Makefile6
-rw-r--r--crypto/external/bsd/netpgp/bin/netpgpverify/Makefile6
-rw-r--r--crypto/external/bsd/netpgp/lib/verify/Makefile4
-rw-r--r--crypto/external/bsd/openssh/bin/sftp/Makefile6
-rw-r--r--external/bsd/libevent/lib/libevent/Makefile10
-rw-r--r--external/bsd/libpcap/lib/Makefile4
-rw-r--r--external/bsd/ntp/Makefile.inc12
-rw-r--r--external/bsd/pdisk/bin/Makefile12
-rw-r--r--external/bsd/pkg_install/Makefile.inc8
-rw-r--r--lib/libbz2/Makefile6
-rw-r--r--sys/conf/copts.mk12
-rw-r--r--sys/external/bsd/drm2/i915drm/files.i915drmkms8
-rw-r--r--sys/external/bsd/drm2/nouveau/files.nouveau4
-rw-r--r--sys/external/bsd/drm2/radeon/files.radeon10
-rw-r--r--sys/external/bsd/drm2/ttm/files.ttm4
-rw-r--r--sys/external/isc/atheros_hal/conf/files.ath_hal6
-rw-r--r--sys/modules/ath_hal/Makefile8
-rw-r--r--sys/modules/pf/Makefile7
-rw-r--r--sys/modules/radeondrm/Makefile6
-rw-r--r--sys/modules/savagedrm/Makefile6
-rw-r--r--sys/modules/viadrmums/Makefile6
-rw-r--r--sys/modules/zlib/Makefile6
-rw-r--r--sys/rump/kern/lib/libz/Makefile6
-rw-r--r--usr.bin/stat/Makefile6
-rw-r--r--usr.bin/telnet/Makefile6
-rw-r--r--usr.sbin/quotacheck/Makefile6
26 files changed, 70 insertions, 111 deletions
diff --git a/bin/ksh/Makefile b/bin/ksh/Makefile
index 80c1848e483..0a5d3497d71 100644
--- a/bin/ksh/Makefile
+++ b/bin/ksh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/09/29 23:44:58 mrg Exp $
+# $NetBSD: Makefile,v 1.37 2023/06/03 21:30:20 lukem Exp $
WARNS=3
CWARNFLAGS.clang+= -Wno-error=cast-qual
@@ -48,8 +48,6 @@ 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
+COPTS+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
.include <bsd.prog.mk>
diff --git a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
index c17cff042d1..025c200111e 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.20 2023/06/03 09:09:01 lukem Exp $
+# $NetBSD: Makefile,v 1.21 2023/06/03 21:30:20 lukem Exp $
PROG=netpgpverify
BINDIR= /usr/bin
@@ -32,9 +32,7 @@ EXTDIST=${.CURDIR}/../../dist
.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS+= -Wno-error=implicit-fallthrough
-.endif
+COPTS+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
COPTS.libverify.c+= ${CC_WNO_FORMAT_TRUNCATION}
diff --git a/crypto/external/bsd/netpgp/lib/verify/Makefile b/crypto/external/bsd/netpgp/lib/verify/Makefile
index 18c5dc2d04c..6ef516e0b7d 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.15 2023/06/03 09:09:01 lukem Exp $
+# $NetBSD: Makefile,v 1.16 2023/06/03 21:30:20 lukem Exp $
LIB=netpgpverify
SRCS+=b64.c
@@ -27,7 +27,7 @@ INCSDIR=/usr/include/netpgp
.include <bsd.own.mk>
-COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-implicit-fallthrough :}
+COPTS+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
COPTS.libverify.c+= ${CC_WNO_FORMAT_TRUNCATION}
LINTFLAGS.bzlib.c+= -X 161 # constant in conditional context
diff --git a/crypto/external/bsd/openssh/bin/sftp/Makefile b/crypto/external/bsd/openssh/bin/sftp/Makefile
index 752f632dbd2..76a02496ebe 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.10 2022/10/05 22:39:36 christos Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 21:30:20 lukem Exp $
BINDIR= /usr/bin
@@ -14,8 +14,6 @@ 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
+COPTS.sftp.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
.include <bsd.prog.mk>
diff --git a/external/bsd/libevent/lib/libevent/Makefile b/external/bsd/libevent/lib/libevent/Makefile
index 6b466bd4235..3f080ec9c95 100644
--- a/external/bsd/libevent/lib/libevent/Makefile
+++ b/external/bsd/libevent/lib/libevent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/02/04 04:05:16 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 21:30:20 lukem Exp $
USE_SHLIBDIR=yes
.include <bsd.own.mk>
@@ -29,10 +29,8 @@ 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
+COPTS.bufferevent_filter.c += ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.evdns.c += ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.event.c += ${CC_WNO_IMPLICIT_FALLTHROUGH}
.include <bsd.lib.mk>
diff --git a/external/bsd/libpcap/lib/Makefile b/external/bsd/libpcap/lib/Makefile
index 85c2cba369b..479f7dc47a7 100644
--- a/external/bsd/libpcap/lib/Makefile
+++ b/external/bsd/libpcap/lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2023/06/03 09:09:04 lukem Exp $
+# $NetBSD: Makefile,v 1.31 2023/06/03 21:30:21 lukem Exp $
USE_SHLIBDIR=yes
.include <bsd.init.mk>
@@ -165,7 +165,7 @@ CLEANFILES+= tokdefs.h scanner.h
COPTS.bpf_image.c+= -Wno-format-nonliteral
-COPTS.gencode.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}
+COPTS.gencode.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
COPTS.pcap.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.pcap-bpf.c+= ${CC_WNO_STRINGOP_TRUNCATION}
COPTS.pcap-new.c+= ${CC_WNO_FORMAT_TRUNCATION}
diff --git a/external/bsd/ntp/Makefile.inc b/external/bsd/ntp/Makefile.inc
index fa29947bf5f..b2cc9a5db5b 100644
--- a/external/bsd/ntp/Makefile.inc
+++ b/external/bsd/ntp/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2022/12/13 21:16:38 christos Exp $
+# $NetBSD: Makefile.inc,v 1.23 2023/06/03 21:30:21 lukem Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -64,12 +64,10 @@ 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
+COPTS.configfile.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.libopts.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.ntp_loopfilter.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.refclock_ulink.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
.SUFFIXES: .1 .5 .8 .1ntpdmdoc .5mdoc .1ntp-keygenmdoc .1ntpdcmdoc .1ntpqmdoc .1sntpmdoc
diff --git a/external/bsd/pdisk/bin/Makefile b/external/bsd/pdisk/bin/Makefile
index 07252dd4b93..db925ca396c 100644
--- a/external/bsd/pdisk/bin/Makefile
+++ b/external/bsd/pdisk/bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/03 09:09:05 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 21:30:21 lukem Exp $
.include <bsd.own.mk>
WARNS=5
@@ -20,13 +20,9 @@ CPPFLAGS+= -I${SRCDIR}
CPPFLAGS+= -D__unix__
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.file_media.c+= -Wno-implicit-fallthrough
-COPTS.pathname.c+= -Wno-implicit-fallthrough
-COPTS.pdisk.c+= -Wno-implicit-fallthrough
-.endif
-
+COPTS.file_media.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
COPTS.partition_map.c+= ${CC_WNO_STRINGOP_TRUNCATION}
-COPTS.pdisk.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.pathname.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.pdisk.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH} ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/external/bsd/pkg_install/Makefile.inc b/external/bsd/pkg_install/Makefile.inc
index 070baae748d..ebe90465094 100644
--- a/external/bsd/pkg_install/Makefile.inc
+++ b/external/bsd/pkg_install/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2019/09/29 23:44:59 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2023/06/03 21:30:21 lukem Exp $
DIST= ${NETBSDSRCDIR}/external/bsd/pkg_install/dist
@@ -15,7 +15,5 @@ CWARNFLAGS+= -Wno-missing-noreturn
.include <bsd.own.mk>
# show_version() does not return
-.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
+COPTS.main.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.pkg_delete.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile
index a7cb39664bc..b2aea1e04b0 100644
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/09/29 23:44:59 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2023/06/03 21:30:21 lukem Exp $
USE_FORT?= yes # data driven bugs?
@@ -20,9 +20,7 @@ INCSDIR= /usr/include
COPTS+= -O0
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS+= -Wno-error=implicit-fallthrough
-.endif
+COPTS+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
# XXX blocksort.c gets mis-compiled with 4.1
.if (${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb") && \
diff --git a/sys/conf/copts.mk b/sys/conf/copts.mk
index 44b1f8f8340..0a8fa4b22a6 100644
--- a/sys/conf/copts.mk
+++ b/sys/conf/copts.mk
@@ -1,4 +1,4 @@
-# $NetBSD: copts.mk,v 1.9 2023/06/03 09:09:13 lukem Exp $
+# $NetBSD: copts.mk,v 1.10 2023/06/03 21:30:21 lukem Exp $
# MI per-file compiler options required.
@@ -8,12 +8,10 @@
.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
-COPTS.pf.c+= -Wno-error=implicit-fallthrough
-COPTS.radeon_cs.c+= -Wno-error=implicit-fallthrough
-COPTS.via_dmablit.c+= -Wno-error=implicit-fallthrough
-.endif
+COPTS.zlib.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.pf.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.radeon_cs.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.via_dmablit.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc" && \
(${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel")
diff --git a/sys/external/bsd/drm2/i915drm/files.i915drmkms b/sys/external/bsd/drm2/i915drm/files.i915drmkms
index 1674b18d334..67797fb95f4 100644
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.88 2022/07/19 23:19:06 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.89 2023/06/03 21:30:22 lukem Exp $
version 20180827
@@ -50,11 +50,11 @@ makeoptions i915drmkms "CWARNFLAGS.i915_sw_fence.c"+="${${ACTIVE_CC} == clang :?
makeoptions i915drmkms "CWARNFLAGS.intel_sprite.c"+="${${ACTIVE_CC} == gcc:? -Wno-maybe-uninitialized :}"
-makeoptions i915drmkms "CWARNFLAGS.intel_ddi.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 10:? -Wno-maybe-uninitialized :} ${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-implicit-fallthrough :}"
-makeoptions i915drmkms "CWARNFLAGS.intel_display.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-implicit-fallthrough :}"
+makeoptions i915drmkms "CWARNFLAGS.intel_ddi.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 10:? -Wno-maybe-uninitialized :} ${CC_WNO_IMPLICIT_FALLTHROUGH}"
+makeoptions i915drmkms "CWARNFLAGS.intel_display.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
makeoptions i915drmkms "CWARNFLAGS.intel_guc_submission.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
makeoptions i915drmkms "CWARNFLAGS.intel_hdmi.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
-makeoptions i915drmkms "CWARNFLAGS.intel_sdvo.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-implicit-fallthrough :}"
+makeoptions i915drmkms "CWARNFLAGS.intel_sdvo.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
makeoptions intelfb "CPPFLAGS.intelfb"+="${CPPFLAGS.i915drmkms}"
makeoptions intelfb "CWARNFLAGS.intelfb"+="${CWARNFLAGS.i915drmkms}"
diff --git a/sys/external/bsd/drm2/nouveau/files.nouveau b/sys/external/bsd/drm2/nouveau/files.nouveau
index 2341c8fcf78..d6d212807c6 100644
--- a/sys/external/bsd/drm2/nouveau/files.nouveau
+++ b/sys/external/bsd/drm2/nouveau/files.nouveau
@@ -1,4 +1,4 @@
-# $NetBSD: files.nouveau,v 1.38 2022/07/19 23:19:07 riastradh Exp $
+# $NetBSD: files.nouveau,v 1.39 2023/06/03 21:30:22 lukem Exp $
version 20180827
@@ -35,7 +35,7 @@ makeoptions nouveau "CWARNFLAGS.nouveau"+="-Wno-missing-field-initializers"
makeoptions nouveau "CWARNFLAGS.nouveau"+="-Wno-pointer-arith"
makeoptions nouveau "CWARNFLAGS.nouveau"+="-Wno-shadow"
makeoptions nouveau "CWARNFLAGS.nouveau"+="${${ACTIVE_CC} == clang:? -Wno-error=gnu-variable-sized-type-not-at-end :}"
-makeoptions nouveau "CWARNFLAGS.nouveau"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}"
+makeoptions nouveau "CWARNFLAGS.nouveau"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
makeoptions nouveau "CWARNFLAGS.nouveau_nvkm_subdev_bios_timing.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=int-in-bool-context :}"
makeoptions nouveau "CWARNFLAGS.nouveau_nvkm_subdev_clk_gt215.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=int-in-bool-context :}"
makeoptions nouveau "CWARNFLAGS.nouveau_nvkm_subdev_instmem_base.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
diff --git a/sys/external/bsd/drm2/radeon/files.radeon b/sys/external/bsd/drm2/radeon/files.radeon
index d9bd0f21681..aa44b5e3cd3 100644
--- a/sys/external/bsd/drm2/radeon/files.radeon
+++ b/sys/external/bsd/drm2/radeon/files.radeon
@@ -1,4 +1,4 @@
-# $NetBSD: files.radeon,v 1.37 2022/07/19 23:19:07 riastradh Exp $
+# $NetBSD: files.radeon,v 1.38 2023/06/03 21:30:22 lukem Exp $
version 20180827
@@ -36,10 +36,10 @@ makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-unused-const-variable"
makeoptions radeon "CWARNFLAGS.radeon"+="${${ACTIVE_CC} == gcc:? -Wno-maybe-uninitialized :}"
-#makeoptions radeon "CWARNFLAGS.radeon_cs.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}"
-makeoptions radeon "CWARNFLAGS.radeon_evergreen_cs.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}"
-makeoptions radeon "CWARNFLAGS.radeon_r300.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}"
-makeoptions radeon "CWARNFLAGS.radeon_r420.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}"
+#makeoptions radeon "CWARNFLAGS.radeon_cs.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
+makeoptions radeon "CWARNFLAGS.radeon_evergreen_cs.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
+makeoptions radeon "CWARNFLAGS.radeon_r300.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
+makeoptions radeon "CWARNFLAGS.radeon_r420.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
makeoptions radeon "CWARNFLAGS.radeon_uvd.c"+="${${ACTIVE_CC} == clang:? -Wno-format :}"
file external/bsd/drm2/radeon/radeon_module.c radeon
diff --git a/sys/external/bsd/drm2/ttm/files.ttm b/sys/external/bsd/drm2/ttm/files.ttm
index 96d648f49b8..4d67eae30c0 100644
--- a/sys/external/bsd/drm2/ttm/files.ttm
+++ b/sys/external/bsd/drm2/ttm/files.ttm
@@ -1,4 +1,4 @@
-# $NetBSD: files.ttm,v 1.9 2022/07/19 23:19:07 riastradh Exp $
+# $NetBSD: files.ttm,v 1.10 2023/06/03 21:30:22 lukem Exp $
# TTM, the texture and tiling manager.
@@ -7,7 +7,7 @@ version 20180827
define drmkms_ttm: drmkms
makeoptions drmkms_ttm "CPPFLAGS.drmkms_ttm"+="${CPPFLAGS.drmkms}"
-makeoptions drmkms "CWARNFLAGS.ttm_bo.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}"
+makeoptions drmkms "CWARNFLAGS.ttm_bo.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
makeoptions drmkms_ttm "CPPFLAGS.drmkms_ttm"+="-DCONFIG_AGP=1"
makeoptions drmkms_ttm "CWARNFLAGS.drmkms_ttm"+="-Wno-missing-field-initializers"
makeoptions drmkms_ttm "CWARNFLAGS.drmkms_ttm"+="-Wno-shadow"
diff --git a/sys/external/isc/atheros_hal/conf/files.ath_hal b/sys/external/isc/atheros_hal/conf/files.ath_hal
index 31dd2f37b4f..ebe817f86e0 100644
--- a/sys/external/isc/atheros_hal/conf/files.ath_hal
+++ b/sys/external/isc/atheros_hal/conf/files.ath_hal
@@ -1,4 +1,4 @@
-# $NetBSD: files.ath_hal,v 1.8 2019/09/30 00:06:02 mrg Exp $
+# $NetBSD: files.ath_hal,v 1.9 2023/06/03 21:30:22 lukem Exp $
defflag opt_athhal.h ATHHAL_ASSERT ATHHAL_DEBUG ATHHAL_DEBUG_ALQ
defflag opt_athhal.h ATHHAL_WRITE_EEPROM ATHHAL_WRITE_REGDOMAIN
@@ -93,7 +93,7 @@ file external/isc/atheros_hal/dist/ar5212/ar5212_reset.c ath & athhal_ar5212_sub
file external/isc/atheros_hal/dist/ar5212/ar5212_rfgain.c ath & athhal_ar5212_subr
file external/isc/atheros_hal/dist/ar5212/ar5212_xmit.c ath & athhal_ar5212_subr
-makeoptions ath "CWARNFLAGS.ar5212_xmit.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}"
+makeoptions ath "CWARNFLAGS.ar5212_xmit.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
# Atheros AR5312 family
#
@@ -142,7 +142,7 @@ file external/isc/atheros_hal/dist/ar5416/ar9285.c ath & athhal_ar5416
file external/isc/atheros_hal/dist/ar5416/ar9285_attach.c ath & athhal_ar5416
file external/isc/atheros_hal/dist/ar5416/ar9285_reset.c ath & athhal_ar5416
-makeoptions ath "CWARNFLAGS.ar5416_xmit.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}"
+makeoptions ath "CWARNFLAGS.ar5416_xmit.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
#
#
diff --git a/sys/modules/ath_hal/Makefile b/sys/modules/ath_hal/Makefile
index c0717ae0610..0ba05bbe1d0 100644
--- a/sys/modules/ath_hal/Makefile
+++ b/sys/modules/ath_hal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/09/29 23:44:59 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 21:30:23 lukem Exp $
.include "../Makefile.inc"
@@ -96,10 +96,8 @@ SRCS+= ar2133.c \
.include "Makefile.inc"
-.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
+COPTS.ar5212_xmit.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.ar5416_xmit.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
.include <bsd.kmodule.mk>
KMODSCRIPT= ${S}/modules/ath_hal/ath_hal.ldscript
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index 892b991279c..d824315d216 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2023/06/03 08:52:58 lukem Exp $
+# $NetBSD: Makefile,v 1.18 2023/06/03 21:30:23 lukem Exp $
.include "../Makefile.inc"
@@ -22,10 +22,7 @@ CPPFLAGS+= -I${S}/dist/pf -I${S} -DINET6 -DINET
WARNS= 3
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.pf.c+= -Wno-error=implicit-fallthrough
-.endif
-COPTS.pf.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+COPTS.pf.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH} ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.pf_norm.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.pf_table.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
diff --git a/sys/modules/radeondrm/Makefile b/sys/modules/radeondrm/Makefile
index 0cb01f8f98a..c8c99aea86d 100644
--- a/sys/modules/radeondrm/Makefile
+++ b/sys/modules/radeondrm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/06/03 15:59:04 nia Exp $
+# $NetBSD: Makefile,v 1.16 2023/06/03 21:30:23 lukem Exp $
.include "../Makefile.inc"
@@ -26,9 +26,7 @@ CPPFLAGS+= -I${S}/external/bsd/drm/dist/bsd-core \
WARNS= 3
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.radeon_cs.c+= -Wno-error=implicit-fallthrough
-.endif
+COPTS.radeon_cs.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
CWARNFLAGS.clang+= -Wno-error=bool-operation
diff --git a/sys/modules/savagedrm/Makefile b/sys/modules/savagedrm/Makefile
index 998b5123097..65f2152402a 100644
--- a/sys/modules/savagedrm/Makefile
+++ b/sys/modules/savagedrm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/09/29 23:45:00 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/03 21:30:23 lukem Exp $
.include "../Makefile.inc"
@@ -17,8 +17,6 @@ CPPFLAGS+= -I${S}/external/bsd/drm/dist/bsd-core \
WARNS= 3
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.savage_state.c+= -Wno-error=implicit-fallthrough
-.endif
+COPTS.savage_state.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
.include <bsd.kmodule.mk>
diff --git a/sys/modules/viadrmums/Makefile b/sys/modules/viadrmums/Makefile
index 756daa35671..363a26b7853 100644
--- a/sys/modules/viadrmums/Makefile
+++ b/sys/modules/viadrmums/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/12/19 16:01:29 riastradh Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 21:30:23 lukem Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -31,8 +31,6 @@ SRCS+= via_pci.c
WARNS= 3
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.via_dmablit.c+= -Wno-error=implicit-fallthrough
-.endif
+COPTS.via_dmablit.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
.include <bsd.kmodule.mk>
diff --git a/sys/modules/zlib/Makefile b/sys/modules/zlib/Makefile
index c721d9f764e..880ae690c84 100644
--- a/sys/modules/zlib/Makefile
+++ b/sys/modules/zlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/09/29 23:45:00 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/03 21:30:24 lukem Exp $
.include "../Makefile.inc"
@@ -9,8 +9,6 @@ SRCS= zlib.c
WARNS= 3
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.zlib.c+= -Wno-error=implicit-fallthrough
-.endif
+COPTS.zlib.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
.include <bsd.kmodule.mk>
diff --git a/sys/rump/kern/lib/libz/Makefile b/sys/rump/kern/lib/libz/Makefile
index 7963f80e172..cd321c9bd6e 100644
--- a/sys/rump/kern/lib/libz/Makefile
+++ b/sys/rump/kern/lib/libz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/09/29 23:45:00 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/03 21:30:24 lukem Exp $
#
# zlib.c is logically in sys/net
@@ -12,6 +12,4 @@ 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
+COPTS.zlib.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
diff --git a/usr.bin/stat/Makefile b/usr.bin/stat/Makefile
index 69421bb207d..aa205aad4c3 100644
--- a/usr.bin/stat/Makefile
+++ b/usr.bin/stat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/06/22 18:02:43 kre Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 21:30:24 lukem Exp $
PROG= stat
@@ -10,9 +10,7 @@ MAN= 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"
-COPTS.stat.c+= -Wno-error=implicit-fallthrough
-.endif
+COPTS.stat.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
COPTS.stat.c += -Wno-format-nonliteral
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 2d0b1369843..935f449d08d 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2023/06/03 09:09:19 lukem Exp $
+# $NetBSD: Makefile,v 1.61 2023/06/03 21:30:24 lukem Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@@ -78,9 +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"
-COPTS.telnet.c+= -Wno-error=implicit-fallthrough
-.endif
+COPTS.telnet.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
COPTS.sys_bsd.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
diff --git a/usr.sbin/quotacheck/Makefile b/usr.sbin/quotacheck/Makefile
index e48885ffb85..e9c601ce16d 100644
--- a/usr.sbin/quotacheck/Makefile
+++ b/usr.sbin/quotacheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/09/29 23:45:01 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2023/06/03 21:30:24 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -15,8 +15,6 @@ SRCS+= quotautil.c
.include <bsd.own.mk>
# Has fallthru comment that is missed
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.quotacheck.c+= -Wno-error=implicit-fallthrough
-.endif
+COPTS.quotacheck.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
.include <bsd.prog.mk>