Module Name: src
Committed By: lukem
Date: Sat Jun 3 21:30:25 UTC 2023
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/libevent/lib/libevent: Makefile
src/external/bsd/libpcap/lib: Makefile
src/external/bsd/ntp: Makefile.inc
src/external/bsd/pdisk/bin: Makefile
src/external/bsd/pkg_install: Makefile.inc
src/lib/libbz2: Makefile
src/sys/conf: copts.mk
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/nouveau: files.nouveau
src/sys/external/bsd/drm2/radeon: files.radeon
src/sys/external/bsd/drm2/ttm: files.ttm
src/sys/external/isc/atheros_hal/conf: files.ath_hal
src/sys/modules/ath_hal: 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/usr.bin/stat: Makefile
src/usr.bin/telnet: Makefile
src/usr.sbin/quotacheck: Makefile
Log Message:
adapt to ${CC_WNO_IMPLICIT_FALLTHROUGH}
Use ${CC_WNO_IMPLICIT_FALLTHROUGH} instead of
the older style more complex expressions.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/bin/ksh/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/netpgp/lib/verify/Makefile
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/lib/libevent/Makefile
cvs rdiff -u -r1.30 -r1.31 src/external/bsd/libpcap/lib/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pdisk/bin/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/Makefile.inc
cvs rdiff -u -r1.20 -r1.21 src/lib/libbz2/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/conf/copts.mk
cvs rdiff -u -r1.88 -r1.89 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/nouveau/files.nouveau
cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/drm2/radeon/files.radeon
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/ttm/files.ttm
cvs rdiff -u -r1.8 -r1.9 src/sys/external/isc/atheros_hal/conf/files.ath_hal
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/ath_hal/Makefile
cvs rdiff -u -r1.17 -r1.18 src/sys/modules/pf/Makefile
cvs rdiff -u -r1.15 -r1.16 src/sys/modules/radeondrm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/savagedrm/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/viadrmums/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/zlib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/kern/lib/libz/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/stat/Makefile
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/telnet/Makefile
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/quotacheck/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.36 src/bin/ksh/Makefile:1.37
--- src/bin/ksh/Makefile:1.36 Sun Sep 29 23:44:58 2019
+++ src/bin/ksh/Makefile Sat Jun 3 21:30:20 2023
@@ -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>
Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.20 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.21
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.20 Sat Jun 3 09:09:01 2023
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Sat Jun 3 21:30:20 2023
@@ -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}
Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.15 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.16
--- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.15 Sat Jun 3 09:09:01 2023
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile Sat Jun 3 21:30:20 2023
@@ -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
Index: src/crypto/external/bsd/openssh/bin/sftp/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.10 src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.11
--- src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.10 Wed Oct 5 22:39:36 2022
+++ src/crypto/external/bsd/openssh/bin/sftp/Makefile Sat Jun 3 21:30:20 2023
@@ -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>
Index: src/external/bsd/libevent/lib/libevent/Makefile
diff -u src/external/bsd/libevent/lib/libevent/Makefile:1.5 src/external/bsd/libevent/lib/libevent/Makefile:1.6
--- src/external/bsd/libevent/lib/libevent/Makefile:1.5 Mon Feb 4 04:05:16 2019
+++ src/external/bsd/libevent/lib/libevent/Makefile Sat Jun 3 21:30:20 2023
@@ -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>
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.30 src/external/bsd/libpcap/lib/Makefile:1.31
--- src/external/bsd/libpcap/lib/Makefile:1.30 Sat Jun 3 09:09:04 2023
+++ src/external/bsd/libpcap/lib/Makefile Sat Jun 3 21:30:21 2023
@@ -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}
Index: src/external/bsd/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.22 src/external/bsd/ntp/Makefile.inc:1.23
--- src/external/bsd/ntp/Makefile.inc:1.22 Tue Dec 13 21:16:38 2022
+++ src/external/bsd/ntp/Makefile.inc Sat Jun 3 21:30:21 2023
@@ -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
Index: src/external/bsd/pdisk/bin/Makefile
diff -u src/external/bsd/pdisk/bin/Makefile:1.5 src/external/bsd/pdisk/bin/Makefile:1.6
--- src/external/bsd/pdisk/bin/Makefile:1.5 Sat Jun 3 09:09:05 2023
+++ src/external/bsd/pdisk/bin/Makefile Sat Jun 3 21:30:21 2023
@@ -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>
Index: src/external/bsd/pkg_install/Makefile.inc
diff -u src/external/bsd/pkg_install/Makefile.inc:1.7 src/external/bsd/pkg_install/Makefile.inc:1.8
--- src/external/bsd/pkg_install/Makefile.inc:1.7 Sun Sep 29 23:44:59 2019
+++ src/external/bsd/pkg_install/Makefile.inc Sat Jun 3 21:30:21 2023
@@ -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}
Index: src/lib/libbz2/Makefile
diff -u src/lib/libbz2/Makefile:1.20 src/lib/libbz2/Makefile:1.21
--- src/lib/libbz2/Makefile:1.20 Sun Sep 29 23:44:59 2019
+++ src/lib/libbz2/Makefile Sat Jun 3 21:30:21 2023
@@ -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") && \
Index: src/sys/conf/copts.mk
diff -u src/sys/conf/copts.mk:1.9 src/sys/conf/copts.mk:1.10
--- src/sys/conf/copts.mk:1.9 Sat Jun 3 09:09:13 2023
+++ src/sys/conf/copts.mk Sat Jun 3 21:30:21 2023
@@ -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")
Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.88 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.89
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.88 Tue Jul 19 23:19:06 2022
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sat Jun 3 21:30:22 2023
@@ -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_
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}"
Index: src/sys/external/bsd/drm2/nouveau/files.nouveau
diff -u src/sys/external/bsd/drm2/nouveau/files.nouveau:1.38 src/sys/external/bsd/drm2/nouveau/files.nouveau:1.39
--- src/sys/external/bsd/drm2/nouveau/files.nouveau:1.38 Tue Jul 19 23:19:07 2022
+++ src/sys/external/bsd/drm2/nouveau/files.nouveau Sat Jun 3 21:30:22 2023
@@ -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"
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 :}"
Index: src/sys/external/bsd/drm2/radeon/files.radeon
diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.37 src/sys/external/bsd/drm2/radeon/files.radeon:1.38
--- src/sys/external/bsd/drm2/radeon/files.radeon:1.37 Tue Jul 19 23:19:07 2022
+++ src/sys/external/bsd/drm2/radeon/files.radeon Sat Jun 3 21:30:22 2023
@@ -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"+=
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
Index: src/sys/external/bsd/drm2/ttm/files.ttm
diff -u src/sys/external/bsd/drm2/ttm/files.ttm:1.9 src/sys/external/bsd/drm2/ttm/files.ttm:1.10
--- src/sys/external/bsd/drm2/ttm/files.ttm:1.9 Tue Jul 19 23:19:07 2022
+++ src/sys/external/bsd/drm2/ttm/files.ttm Sat Jun 3 21:30:22 2023
@@ -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"
Index: src/sys/external/isc/atheros_hal/conf/files.ath_hal
diff -u src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.8 src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.9
--- src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.8 Mon Sep 30 00:06:02 2019
+++ src/sys/external/isc/atheros_hal/conf/files.ath_hal Sat Jun 3 21:30:22 2023
@@ -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/ar521
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/ar541
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}"
#
#
Index: src/sys/modules/ath_hal/Makefile
diff -u src/sys/modules/ath_hal/Makefile:1.6 src/sys/modules/ath_hal/Makefile:1.7
--- src/sys/modules/ath_hal/Makefile:1.6 Sun Sep 29 23:44:59 2019
+++ src/sys/modules/ath_hal/Makefile Sat Jun 3 21:30:23 2023
@@ -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
Index: src/sys/modules/pf/Makefile
diff -u src/sys/modules/pf/Makefile:1.17 src/sys/modules/pf/Makefile:1.18
--- src/sys/modules/pf/Makefile:1.17 Sat Jun 3 08:52:58 2023
+++ src/sys/modules/pf/Makefile Sat Jun 3 21:30:23 2023
@@ -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
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}
Index: src/sys/modules/radeondrm/Makefile
diff -u src/sys/modules/radeondrm/Makefile:1.15 src/sys/modules/radeondrm/Makefile:1.16
--- src/sys/modules/radeondrm/Makefile:1.15 Thu Jun 3 15:59:04 2021
+++ src/sys/modules/radeondrm/Makefile Sat Jun 3 21:30:23 2023
@@ -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/
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
Index: src/sys/modules/savagedrm/Makefile
diff -u src/sys/modules/savagedrm/Makefile:1.4 src/sys/modules/savagedrm/Makefile:1.5
--- src/sys/modules/savagedrm/Makefile:1.4 Sun Sep 29 23:45:00 2019
+++ src/sys/modules/savagedrm/Makefile Sat Jun 3 21:30:23 2023
@@ -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/
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>
Index: src/sys/modules/viadrmums/Makefile
diff -u src/sys/modules/viadrmums/Makefile:1.5 src/sys/modules/viadrmums/Makefile:1.6
--- src/sys/modules/viadrmums/Makefile:1.5 Sun Dec 19 16:01:29 2021
+++ src/sys/modules/viadrmums/Makefile Sat Jun 3 21:30:23 2023
@@ -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>
Index: src/sys/modules/zlib/Makefile
diff -u src/sys/modules/zlib/Makefile:1.4 src/sys/modules/zlib/Makefile:1.5
--- src/sys/modules/zlib/Makefile:1.4 Sun Sep 29 23:45:00 2019
+++ src/sys/modules/zlib/Makefile Sat Jun 3 21:30:24 2023
@@ -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>
Index: src/sys/rump/kern/lib/libz/Makefile
diff -u src/sys/rump/kern/lib/libz/Makefile:1.4 src/sys/rump/kern/lib/libz/Makefile:1.5
--- src/sys/rump/kern/lib/libz/Makefile:1.4 Sun Sep 29 23:45:00 2019
+++ src/sys/rump/kern/lib/libz/Makefile Sat Jun 3 21:30:24 2023
@@ -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}
Index: src/usr.bin/stat/Makefile
diff -u src/usr.bin/stat/Makefile:1.12 src/usr.bin/stat/Makefile:1.13
--- src/usr.bin/stat/Makefile:1.12 Wed Jun 22 18:02:43 2022
+++ src/usr.bin/stat/Makefile Sat Jun 3 21:30:24 2023
@@ -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
Index: src/usr.bin/telnet/Makefile
diff -u src/usr.bin/telnet/Makefile:1.60 src/usr.bin/telnet/Makefile:1.61
--- src/usr.bin/telnet/Makefile:1.60 Sat Jun 3 09:09:19 2023
+++ src/usr.bin/telnet/Makefile Sat Jun 3 21:30:24 2023
@@ -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}
Index: src/usr.sbin/quotacheck/Makefile
diff -u src/usr.sbin/quotacheck/Makefile:1.21 src/usr.sbin/quotacheck/Makefile:1.22
--- src/usr.sbin/quotacheck/Makefile:1.21 Sun Sep 29 23:45:01 2019
+++ src/usr.sbin/quotacheck/Makefile Sat Jun 3 21:30:24 2023
@@ -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>
