summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2023-06-03 09:09:01 +0000
committerlukem <lukem@NetBSD.org>2023-06-03 09:09:01 +0000
commitff6601a6cc5f10bccaf009e4e2b72c75774d7a4d (patch)
tree87fe4eb9bda81296a5ed95f9cf55e1a2bf1ecd9a
parentabaa8cb87058c08ad0688c849a28f4e007c07bbb (diff)
bsd.own.mk: rename GCC_NO_* to CC_WNO_*
Rename compiler-warning-disable variables from GCC_NO_warning to CC_WNO_warning where warning is the full warning name as used by the compiler. GCC_NO_IMPLICIT_FALLTHRU is CC_WNO_IMPLICIT_FALLTHROUGH Using the convention CC_compilerflag, where compilerflag is based on the full compiler flag name.
-rw-r--r--bin/pax/Makefile4
-rw-r--r--crypto/external/bsd/netpgp/bin/netpgpverify/Makefile4
-rw-r--r--crypto/external/bsd/netpgp/lib/netpgp/Makefile4
-rw-r--r--crypto/external/bsd/netpgp/lib/verify/Makefile4
-rw-r--r--crypto/external/bsd/openssh/bin/ssh-agent/Makefile4
-rw-r--r--crypto/external/bsd/openssh/bin/ssh-keygen/Makefile4
-rw-r--r--crypto/external/bsd/openssh/bin/ssh/Makefile4
-rw-r--r--crypto/external/bsd/openssh/bin/sshd/Makefile6
-rw-r--r--crypto/external/bsd/openssh/lib/Makefile6
-rw-r--r--distrib/utils/zcat/Makefile4
-rw-r--r--external/apache2/llvm/lib/libLLVMAnalysis/Makefile4
-rw-r--r--external/apache2/llvm/librt/libLLVMRuntimeDyld/Makefile4
-rw-r--r--external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile4
-rw-r--r--external/bsd/am-utils/bin/amd/Makefile4
-rw-r--r--external/bsd/atf/lib/libatf-c/Makefile4
-rw-r--r--external/bsd/fetch/lib/Makefile4
-rw-r--r--external/bsd/flex/bin/Makefile8
-rw-r--r--external/bsd/ipf/Makefile.inc4
-rw-r--r--external/bsd/ipf/bin/ipfstat/Makefile4
-rw-r--r--external/bsd/ipf/bin/ipftest/Makefile4
-rw-r--r--external/bsd/ipf/bin/ipmon/Makefile4
-rw-r--r--external/bsd/iscsi/lib/Makefile4
-rw-r--r--external/bsd/libarchive/lib/libarchive/Makefile16
-rw-r--r--external/bsd/libpcap/lib/Makefile10
-rw-r--r--external/bsd/mdocml/bin/mandoc/Makefile4
-rw-r--r--external/bsd/ntp/bin/ntpd/Makefile14
-rw-r--r--external/bsd/ntp/bin/ntpq/Makefile4
-rw-r--r--external/bsd/ntp/bin/sntp/Makefile4
-rw-r--r--external/bsd/ntp/lib/libntp/Makefile4
-rw-r--r--external/bsd/ntp/lib/libopts/Makefile4
-rw-r--r--external/bsd/openldap/lib/liblber/Makefile4
-rw-r--r--external/bsd/openldap/lib/libldap/Makefile.libldap4
-rw-r--r--external/bsd/pdisk/bin/Makefile6
-rw-r--r--external/bsd/ppp/usr.sbin/pppd/Makefile4
-rw-r--r--external/bsd/ppp/usr.sbin/pppstats/Makefile4
-rw-r--r--external/bsd/tcpdump/bin/Makefile4
-rw-r--r--external/bsd/tmux/usr.bin/tmux/Makefile6
-rw-r--r--external/bsd/top/bin/Makefile4
-rw-r--r--external/cddl/osnet/lib/libdtrace/Makefile8
-rw-r--r--external/cddl/osnet/usr.bin/ctfconvert/Makefile6
-rw-r--r--external/cddl/osnet/usr.bin/ctfmerge/Makefile4
-rw-r--r--external/gpl2/groff/bin/troff/Makefile4
-rw-r--r--external/gpl2/lvm2/lib/libdevmapper/Makefile6
-rw-r--r--external/gpl2/lvm2/lib/liblvm/Makefile4
-rw-r--r--external/gpl2/xcvs/bin/xcvs/Makefile16
-rw-r--r--external/gpl3/gcc.old/README.warnings34
-rw-r--r--external/gpl3/gcc.old/lib/libiberty/Makefile4
-rw-r--r--external/gpl3/gcc.old/usr.bin/common-target/Makefile4
-rw-r--r--external/gpl3/gcc/README.warnings34
-rw-r--r--external/gpl3/gcc/lib/libiberty/Makefile4
-rw-r--r--external/gpl3/gcc/usr.bin/common-target/Makefile4
-rw-r--r--external/mit/lua/lib/liblua/Makefile4
-rw-r--r--external/mit/xorg/bin/xauth/Makefile4
-rw-r--r--external/mit/xorg/bin/xconsole/Makefile4
-rw-r--r--external/mit/xorg/bin/xmh/Makefile4
-rw-r--r--external/mit/xorg/lib/libX11/Makefile.ximcp4
-rw-r--r--external/mit/xorg/lib/libX11/Makefile.xlibi18n4
-rw-r--r--external/mit/xorg/lib/libXvMCW/Makefile4
-rw-r--r--external/mit/xorg/lib/libxkbfile/Makefile4
-rw-r--r--external/mit/xorg/server/drivers/xf86-video-sis/Makefile4
-rw-r--r--external/mpl/bind/bin/dnssec/dnssec-verify/Makefile4
-rw-r--r--external/mpl/dhcp/bin/relay/Makefile4
-rw-r--r--external/mpl/dhcp/bin/server/Makefile6
-rw-r--r--external/mpl/dhcp/lib/common/Makefile6
-rw-r--r--external/public-domain/sqlite/lib/Makefile4
-rw-r--r--external/public-domain/xz/bin/xz/Makefile4
-rw-r--r--external/zlib/pigz/bin/pigz/Makefile4
-rw-r--r--games/hack/Makefile8
-rw-r--r--games/hunt/hunt/Makefile4
-rw-r--r--games/hunt/huntd/Makefile8
-rw-r--r--games/rogue/Makefile4
-rw-r--r--games/tetris/Makefile6
-rw-r--r--lib/libc/citrus/Makefile.inc6
-rw-r--r--lib/libc/net/Makefile.inc4
-rw-r--r--lib/libc/resolv/Makefile.inc4
-rw-r--r--lib/libc/rpc/Makefile.inc20
-rw-r--r--lib/libedit/Makefile8
-rw-r--r--lib/libisns/Makefile4
-rw-r--r--lib/libpam/libpam/Makefile4
-rw-r--r--lib/libpam/modules/pam_lastlog/Makefile4
-rw-r--r--lib/librump/Makefile10
-rw-r--r--lib/librumpclient/Makefile4
-rw-r--r--lib/librumpres/Makefile4
-rw-r--r--lib/librumpuser/Makefile4
-rw-r--r--lib/libutil/Makefile6
-rw-r--r--lib/libz/Makefile6
-rw-r--r--libexec/ftpd/Makefile10
-rw-r--r--libexec/lfs_cleanerd/Makefile.inc4
-rw-r--r--libexec/rpc.rquotad/Makefile4
-rw-r--r--libexec/rpc.rstatd/Makefile4
-rw-r--r--libexec/rpc.rusersd/Makefile4
-rw-r--r--libexec/rpc.rwalld/Makefile4
-rw-r--r--libexec/rpc.sprayd/Makefile4
-rw-r--r--sbin/disklabel/Makefile6
-rw-r--r--sbin/dump/Makefile6
-rw-r--r--sbin/dump_lfs/Makefile4
-rw-r--r--sbin/fdisk/Makefile4
-rw-r--r--sbin/init/Makefile4
-rw-r--r--sbin/iscsictl/Makefile4
-rw-r--r--sbin/pppoectl/Makefile4
-rw-r--r--sbin/raidctl/Makefile4
-rw-r--r--sbin/restore/Makefile6
-rw-r--r--sbin/rndctl/Makefile4
-rw-r--r--sbin/route/Makefile4
-rw-r--r--sbin/routed/Makefile4
-rw-r--r--sbin/umount/Makefile4
-rw-r--r--share/mk/bsd.own.mk32
-rw-r--r--sys/conf/copts.mk8
-rw-r--r--sys/modules/coredump/Makefile4
-rw-r--r--sys/modules/drmkms_ttm/Makefile4
-rw-r--r--sys/modules/dtrace/dtrace/Makefile4
-rw-r--r--sys/modules/hpacel/Makefile4
-rw-r--r--sys/modules/i915drmkms/Makefile10
-rw-r--r--sys/modules/lua/Makefile4
-rw-r--r--sys/modules/ptrace_common/Makefile4
-rw-r--r--sys/rump/fs/lib/libffs/Makefile4
-rw-r--r--sys/rump/librump/rumpkern/Makefile.rumpkern12
-rw-r--r--sys/rump/net/lib/libnet/Makefile8
-rw-r--r--tests/fs/common/Makefile14
-rw-r--r--tests/fs/nfs/nfsservice/Makefile12
-rw-r--r--tests/lib/libarchive/Makefile4
-rw-r--r--tests/lib/libc/rpc/Makefile4
-rw-r--r--tests/lib/libc/ssp/Makefile4
-rw-r--r--tests/lib/libc/string/Makefile4
-rw-r--r--tests/lib/libevent/Makefile6
-rw-r--r--tests/sys/netatalk/Makefile4
-rw-r--r--tools/compat/defs.mk.in10
-rw-r--r--usr.bin/btpin/Makefile4
-rw-r--r--usr.bin/config/Makefile8
-rw-r--r--usr.bin/crunch/crunchgen/Makefile4
-rw-r--r--usr.bin/cvslatest/Makefile4
-rw-r--r--usr.bin/fstat/Makefile4
-rw-r--r--usr.bin/ftp/Makefile4
-rw-r--r--usr.bin/hexdump/Makefile4
-rw-r--r--usr.bin/login/Makefile6
-rw-r--r--usr.bin/mail/Makefile4
-rw-r--r--usr.bin/make/Makefile10
-rw-r--r--usr.bin/man/Makefile4
-rw-r--r--usr.bin/mklocale/Makefile4
-rw-r--r--usr.bin/msgs/Makefile4
-rw-r--r--usr.bin/netstat/Makefile8
-rw-r--r--usr.bin/quota/Makefile4
-rw-r--r--usr.bin/rdist/Makefile4
-rw-r--r--usr.bin/rpcgen/Makefile4
-rw-r--r--usr.bin/rpcinfo/Makefile4
-rw-r--r--usr.bin/rup/Makefile4
-rw-r--r--usr.bin/rusers/Makefile4
-rw-r--r--usr.bin/rwall/Makefile4
-rw-r--r--usr.bin/showmount/Makefile4
-rw-r--r--usr.bin/sort/Makefile4
-rw-r--r--usr.bin/systat/Makefile8
-rw-r--r--usr.bin/talk/Makefile4
-rw-r--r--usr.bin/telnet/Makefile4
-rw-r--r--usr.bin/tftp/Makefile4
-rw-r--r--usr.bin/unifdef/Makefile4
-rw-r--r--usr.bin/utoppya/Makefile4
-rw-r--r--usr.bin/w/Makefile4
-rw-r--r--usr.bin/wall/Makefile4
-rw-r--r--usr.bin/xinstall/Makefile4
-rw-r--r--usr.sbin/acpitools/amldb/Makefile4
-rw-r--r--usr.sbin/altq/altqstat/Makefile4
-rw-r--r--usr.sbin/altq/libaltq/Makefile4
-rw-r--r--usr.sbin/altq/tbrconfig/Makefile4
-rw-r--r--usr.sbin/apm/Makefile4
-rw-r--r--usr.sbin/apmd/Makefile4
-rw-r--r--usr.sbin/btpand/Makefile4
-rw-r--r--usr.sbin/catman/Makefile4
-rw-r--r--usr.sbin/cnwctl/Makefile4
-rw-r--r--usr.sbin/crash/Makefile4
-rw-r--r--usr.sbin/edquota/Makefile4
-rw-r--r--usr.sbin/ifwatchd/Makefile4
-rw-r--r--usr.sbin/ipwctl/Makefile4
-rw-r--r--usr.sbin/iwictl/Makefile4
-rw-r--r--usr.sbin/makefs/Makefile12
-rw-r--r--usr.sbin/mopd/common/Makefile4
-rw-r--r--usr.sbin/mopd/mopd/Makefile4
-rw-r--r--usr.sbin/mountd/Makefile4
-rw-r--r--usr.sbin/mrouted/Makefile6
-rw-r--r--usr.sbin/perfused/Makefile4
-rw-r--r--usr.sbin/pf/pfctl/Makefile4
-rw-r--r--usr.sbin/rarpd/Makefile4
-rw-r--r--usr.sbin/rbootd/Makefile4
-rw-r--r--usr.sbin/repquota/Makefile4
-rw-r--r--usr.sbin/route6d/Makefile4
-rw-r--r--usr.sbin/rpc.bootparamd/Makefile4
-rw-r--r--usr.sbin/rpc.lockd/Makefile8
-rw-r--r--usr.sbin/rpc.pcnfsd/Makefile8
-rw-r--r--usr.sbin/rpc.statd/Makefile10
-rw-r--r--usr.sbin/rpc.yppasswdd/Makefile4
-rw-r--r--usr.sbin/rpcbind/Makefile10
-rw-r--r--usr.sbin/rtadvd/Makefile6
-rw-r--r--usr.sbin/rwhod/Makefile4
-rw-r--r--usr.sbin/sliplogin/Makefile4
-rw-r--r--usr.sbin/spray/Makefile4
-rw-r--r--usr.sbin/srtconfig/Makefile4
-rw-r--r--usr.sbin/sysinst/Makefile.inc8
-rw-r--r--usr.sbin/syslogd/Makefile4
-rw-r--r--usr.sbin/timed/timed/Makefile4
-rw-r--r--usr.sbin/wiconfig/Makefile4
-rw-r--r--usr.sbin/ypbind/Makefile4
-rw-r--r--usr.sbin/ypserv/makedbm/Makefile4
-rw-r--r--usr.sbin/ypserv/yppush/Makefile6
-rw-r--r--usr.sbin/ypserv/ypserv/Makefile4
-rw-r--r--usr.sbin/ypserv/ypxfr/Makefile4
-rw-r--r--usr.sbin/ypset/Makefile4
205 files changed, 568 insertions, 564 deletions
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index efd00d5d0e5..aee91d41804 100644
--- a/bin/pax/Makefile
+++ b/bin/pax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/10/13 07:28:04 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2023/06/03 09:09:01 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include <bsd.own.mk>
@@ -50,6 +50,6 @@ LDADD+= -lrmt
DPADD+= ${LIBRMT}
.endif
-COPTS.tar.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.tar.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
index 22fa291fff9..c17cff042d1 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.19 2022/08/27 08:58:31 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2023/06/03 09:09:01 lukem Exp $
PROG=netpgpverify
BINDIR= /usr/bin
@@ -36,7 +36,7 @@ EXTDIST=${.CURDIR}/../../dist
COPTS+= -Wno-error=implicit-fallthrough
.endif
-COPTS.libverify.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.libverify.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/crypto/external/bsd/netpgp/lib/netpgp/Makefile b/crypto/external/bsd/netpgp/lib/netpgp/Makefile
index 3541ceb1015..f30cb5f0f84 100644
--- a/crypto/external/bsd/netpgp/lib/netpgp/Makefile
+++ b/crypto/external/bsd/netpgp/lib/netpgp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/05/09 00:14:44 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:01 lukem Exp $
.include <bsd.own.mk>
@@ -26,7 +26,7 @@ LIBDPLIBS+= crypto ${OPENSSL}/lib/libcrypto
LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
-COPTS.crypto.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.crypto.c+= ${CC_WNO_STRINGOP_OVERFLOW}
COPTS.openssl_crypto.c+=-Wno-error=deprecated-declarations
COPTS.symmetric.c+=-Wno-error=deprecated-declarations
diff --git a/crypto/external/bsd/netpgp/lib/verify/Makefile b/crypto/external/bsd/netpgp/lib/verify/Makefile
index 5bd659dde80..18c5dc2d04c 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.14 2022/08/27 08:58:32 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/03 09:09:01 lukem Exp $
LIB=netpgpverify
SRCS+=b64.c
@@ -28,7 +28,7 @@ INCSDIR=/usr/include/netpgp
.include <bsd.own.mk>
COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-implicit-fallthrough :}
-COPTS.libverify.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.libverify.c+= ${CC_WNO_FORMAT_TRUNCATION}
LINTFLAGS.bzlib.c+= -X 161 # constant in conditional context
LINTFLAGS.bzlib.c+= -X 220 # fallthrough on case statement
diff --git a/crypto/external/bsd/openssh/bin/ssh-agent/Makefile b/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
index 14107923f5e..c2eb0da7371 100644
--- a/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
+++ b/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2023/05/09 22:25:26 christos Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 09:09:02 lukem Exp $
BINDIR=/usr/bin
PROG= ssh-agent
SRCS= ssh-agent.c ssh-pkcs11-client.c
-COPTS.ssh-agent.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.ssh-agent.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.ssh-pkcs11-client.c+= -Wno-error=deprecated-declarations
.include <bsd.prog.mk>
diff --git a/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile b/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
index 3b5160f298c..a6b3a210b9f 100644
--- a/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
+++ b/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/05/09 22:25:26 christos Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 09:09:02 lukem Exp $
BINDIR= /usr/bin
@@ -7,7 +7,7 @@ SRCS= ssh-keygen.c moduli.c sshsig.c
COPTS.ssh-keygen.c+= -Wno-pointer-sign
-COPTS.ssh-keygen.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.ssh-keygen.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.ssh-keygen.c+= -Wno-error=deprecated-declarations
COPTS.moduli.c+= -Wno-error=deprecated-declarations
diff --git a/crypto/external/bsd/openssh/bin/ssh/Makefile b/crypto/external/bsd/openssh/bin/ssh/Makefile
index e04a5731427..6cde70a4f24 100644
--- a/crypto/external/bsd/openssh/bin/ssh/Makefile
+++ b/crypto/external/bsd/openssh/bin/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2022/10/05 22:39:36 christos Exp $
+# $NetBSD: Makefile,v 1.19 2023/06/03 09:09:02 lukem Exp $
.include <bsd.own.mk>
@@ -23,6 +23,6 @@ LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD}
DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
.endif
-COPTS.sshconnect.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.sshconnect.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/crypto/external/bsd/openssh/bin/sshd/Makefile b/crypto/external/bsd/openssh/bin/sshd/Makefile
index 622d1912035..2ff8a0c08e4 100644
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2023/05/09 22:25:26 christos Exp $
+# $NetBSD: Makefile,v 1.27 2023/06/03 09:09:02 lukem Exp $
.include <bsd.own.mk>
@@ -71,8 +71,8 @@ LDADD+= -lblocklist
DPADD+= ${LIBBLOCKLIST}
.endif
-COPTS.sshlogin.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.ldapauth.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.sshlogin.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.ldapauth.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_STRINGOP_OVERFLOW}
COPTS.monitor.c+= -Wno-error=deprecated-declarations
COPTS.kexgexs.c+= -Wno-error=deprecated-declarations
diff --git a/crypto/external/bsd/openssh/lib/Makefile b/crypto/external/bsd/openssh/lib/Makefile
index edd83725ca1..068edcc856f 100644
--- a/crypto/external/bsd/openssh/lib/Makefile
+++ b/crypto/external/bsd/openssh/lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2023/05/09 02:08:31 christos Exp $
+# $NetBSD: Makefile,v 1.36 2023/06/03 09:09:02 lukem Exp $
.include <bsd.own.mk>
@@ -127,8 +127,8 @@ COPTS.poly1305.c+= -O0
COPTS.umac.c+= -O0
.endif
-COPTS.hostfile.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.sshkey.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.hostfile.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.sshkey.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.cipher.c+= -Wno-error=deprecated-declarations
COPTS.dh.c+= -Wno-error=deprecated-declarations
COPTS.kex.c+= -Wno-error=deprecated-declarations
diff --git a/distrib/utils/zcat/Makefile b/distrib/utils/zcat/Makefile
index 9e119883f94..e2c0a282a7f 100644
--- a/distrib/utils/zcat/Makefile
+++ b/distrib/utils/zcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/04/24 04:50:47 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2023/06/03 09:09:02 lukem 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
-COPTS.inflate.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
+COPTS.inflate.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
.include <bsd.prog.mk>
diff --git a/external/apache2/llvm/lib/libLLVMAnalysis/Makefile b/external/apache2/llvm/lib/libLLVMAnalysis/Makefile
index 7e6a02d982c..f3c76fe4f34 100644
--- a/external/apache2/llvm/lib/libLLVMAnalysis/Makefile
+++ b/external/apache2/llvm/lib/libLLVMAnalysis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/05/30 01:56:50 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 09:09:02 lukem Exp $
LIB= LLVMAnalysis
@@ -127,4 +127,4 @@ SRCS+= AliasAnalysis.cpp \
.include <bsd.lib.mk>
.endif
-CWARNFLAGS.gcc+= ${GCC_NO_STRINGOP_OVERFLOW}
+CWARNFLAGS.gcc+= ${CC_WNO_STRINGOP_OVERFLOW}
diff --git a/external/apache2/llvm/librt/libLLVMRuntimeDyld/Makefile b/external/apache2/llvm/librt/libLLVMRuntimeDyld/Makefile
index 79ceaec5366..b889408f8a6 100644
--- a/external/apache2/llvm/librt/libLLVMRuntimeDyld/Makefile
+++ b/external/apache2/llvm/librt/libLLVMRuntimeDyld/Makefile
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2020/09/07 00:18:26 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/03 09:09:02 lukem Exp $
.include <bsd.init.mk>
-CWARNFLAGS.gcc+= ${GCC_NO_STRINGOP_OVERFLOW}
+CWARNFLAGS.gcc+= ${CC_WNO_STRINGOP_OVERFLOW}
diff --git a/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile b/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
index e131bc8b16b..511b23e3f9f 100644
--- a/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
+++ b/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/06/03 08:52:53 lukem Exp $
+# $NetBSD: Makefile,v 1.16 2023/06/03 09:09:02 lukem Exp $
PROG= mdnsd
@@ -20,6 +20,6 @@ MAN= mdnsd.8
CWARNFLAGS.clang+= -Wno-unused-value -Wno-error=address-of-packed-member
CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
-COPTS.DNSCommon.c+= ${GCC_NO_RETURN_LOCAL_ADDR}
+COPTS.DNSCommon.c+= ${CC_WNO_RETURN_LOCAL_ADDR}
.include <bsd.prog.mk>
diff --git a/external/bsd/am-utils/bin/amd/Makefile b/external/bsd/am-utils/bin/amd/Makefile
index f64af733c30..2c9b16a9901 100644
--- a/external/bsd/am-utils/bin/amd/Makefile
+++ b/external/bsd/am-utils/bin/amd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/08/14 16:17:57 christos Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/03 09:09:03 lukem Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -67,6 +67,6 @@ build_version.h: get_args.c
echo '#define BUILD_HOST "'unknown'"' >> ${.TARGET}
echo '#define BUILD_DATE "'unknown'"' >> ${.TARGET}
-COPTS.sun_map.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.sun_map.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/external/bsd/atf/lib/libatf-c/Makefile b/external/bsd/atf/lib/libatf-c/Makefile
index 636e97adad0..27238767864 100644
--- a/external/bsd/atf/lib/libatf-c/Makefile
+++ b/external/bsd/atf/lib/libatf-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2020/06/07 23:09:34 fox Exp $
+# $NetBSD: Makefile,v 1.24 2023/06/03 09:09:03 lukem Exp $
NOLINT= # defined
@@ -54,7 +54,7 @@ INCSDIR_atf-c.h=/usr/include
MAN= atf-c-api.3
COPTS.tc.c+= ${${ACTIVE_CC} == "clang" && ${MACHINE_ARCH} == "powerpc":? -O0 :}
-COPTS.fs.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.fs.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.if ${MKSHARE} != "no"
FILES+= atf-c.pc
diff --git a/external/bsd/fetch/lib/Makefile b/external/bsd/fetch/lib/Makefile
index c80cf3df783..605d2515c8e 100644
--- a/external/bsd/fetch/lib/Makefile
+++ b/external/bsd/fetch/lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/06/01 00:55:24 kamil Exp $
+# $NetBSD: Makefile,v 1.18 2023/06/03 09:09:03 lukem Exp $
LIB= fetch
SRCS= fetch.c common.c ftp.c http.c file.c
@@ -32,6 +32,6 @@ httperr.h: ${LIBFETCHDIR}/http.errors ${LIBFETCHDIR}/errlist.sh
${HOST_SH} ${LIBFETCHDIR}/errlist.sh http_errlist HTTP \
${LIBFETCHDIR}/http.errors > ${.TARGET}
-COPTS.http.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.http.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.lib.mk>
diff --git a/external/bsd/flex/bin/Makefile b/external/bsd/flex/bin/Makefile
index 27b05eb51df..23e8ac6a976 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.16 2021/04/12 02:54:07 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 09:09:03 lukem 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
@@ -78,8 +78,8 @@ COPTS.scan.c+= -O1
. endif
.endif
-COPTS.filter.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.misc.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.parse.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.filter.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.misc.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.parse.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/external/bsd/ipf/Makefile.inc b/external/bsd/ipf/Makefile.inc
index 4cbeea00c51..f846c3765bd 100644
--- a/external/bsd/ipf/Makefile.inc
+++ b/external/bsd/ipf/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2023/06/03 08:52:53 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.8 2023/06/03 09:09:03 lukem Exp $
WARNS?= 1 # XXX -Wcast-qual -Wshadow
CWARNFLAGS.clang+= -Wno-format -Wno-tautological-compare \
@@ -33,7 +33,7 @@ LDADD+= -L${IPFOBJDIR} -lipf -lkvm
CLEANFILES+= y.tab.c y.tab.h
-COPTS+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS+= ${CC_WNO_STRINGOP_TRUNCATION}
.PATH: ${UDIST} \
${UDIST}/lib \
diff --git a/external/bsd/ipf/bin/ipfstat/Makefile b/external/bsd/ipf/bin/ipfstat/Makefile
index 01b93267dc9..a42bf68d6ac 100644
--- a/external/bsd/ipf/bin/ipfstat/Makefile
+++ b/external/bsd/ipf/bin/ipfstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/04/12 02:54:07 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/03 09:09:03 lukem Exp $
PROG= ipfstat
SRCS= ipfstat.c
@@ -6,6 +6,6 @@ MAN= ipfstat.8
DPADD+= ${LIBCURSES} ${LIBTERMINFO}
LDADD+= -lcurses -lterminfo
-COPTS.ipfstat.c+= ${GCC_NO_FORMAT_OVERFLOW}
+COPTS.ipfstat.c+= ${CC_WNO_FORMAT_OVERFLOW}
.include <bsd.prog.mk>
diff --git a/external/bsd/ipf/bin/ipftest/Makefile b/external/bsd/ipf/bin/ipftest/Makefile
index 7a28120e210..1a42218b069 100644
--- a/external/bsd/ipf/bin/ipftest/Makefile
+++ b/external/bsd/ipf/bin/ipftest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:06 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 09:09:03 lukem Exp $
.include <bsd.own.mk>
@@ -109,6 +109,6 @@ COPTS.ipf_y.c+= -O1
. endif
.endif
-COPTS.fil.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.fil.c+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.prog.mk>
diff --git a/external/bsd/ipf/bin/ipmon/Makefile b/external/bsd/ipf/bin/ipmon/Makefile
index b1fe88e03ac..45e52d629cf 100644
--- a/external/bsd/ipf/bin/ipmon/Makefile
+++ b/external/bsd/ipf/bin/ipmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/03 08:52:53 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:03 lukem Exp $
PROG= ipmon
SRCS= ipmon.c ipmon_y.c ipmon_l.c
@@ -36,6 +36,6 @@ ipmon_l.h: lexer.h
${TOOL_SED} -e 's/yy/ipmon_yy/g' \
${.ALLSRC} > ${.TARGET}
-COPTS.ipmon.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER} ${GCC_NO_FORMAT_OVERFLOW}
+COPTS.ipmon.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER} ${CC_WNO_FORMAT_OVERFLOW}
.include <bsd.prog.mk>
diff --git a/external/bsd/iscsi/lib/Makefile b/external/bsd/iscsi/lib/Makefile
index 767962c5567..b6cfd71556c 100644
--- a/external/bsd/iscsi/lib/Makefile
+++ b/external/bsd/iscsi/lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:06 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:03 lukem Exp $
.include <bsd.own.mk>
@@ -23,6 +23,6 @@ ISCSIDIST= ${.CURDIR}/../dist
LIBDPLIBS+= pthread ${.CURDIR}/../../../../lib/libpthread
-COPTS.target.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.target.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.lib.mk>
diff --git a/external/bsd/libarchive/lib/libarchive/Makefile b/external/bsd/libarchive/lib/libarchive/Makefile
index b5dc1ff21b3..608271918bd 100644
--- a/external/bsd/libarchive/lib/libarchive/Makefile
+++ b/external/bsd/libarchive/lib/libarchive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/05/08 21:20:29 christos Exp $
+# $NetBSD: Makefile,v 1.16 2023/06/03 09:09:04 lukem Exp $
.include <bsd.init.mk>
@@ -449,13 +449,13 @@ MLINKS+= archive_write_set_options.3 archive_write_set_option.3
MLINKS+= archive_write_set_passphrase.3 archive_write_set_passphrase_callback.3
MLINKS+= libarchive.3 archive.3
-COPTS.archive_acl.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
-COPTS.archive_read.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
-COPTS.archive_read_support_format_7zip.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
-COPTS.archive_read_support_format_mtree.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
-COPTS.archive_read_support_format_rar5.c+= ${GCC_NO_MAYBE_UNINITIALIZED}
-COPTS.target.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.archive_write_set_format_iso9660.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.archive_acl.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.archive_read.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.archive_read_support_format_7zip.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.archive_read_support_format_mtree.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.archive_read_support_format_rar5.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
+COPTS.target.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.archive_write_set_format_iso9660.c+= ${CC_WNO_STRINGOP_TRUNCATION}
COPTS.archive_hmac.c+= -Wno-error=deprecated-declarations
FILES+= libarchive.pc
diff --git a/external/bsd/libpcap/lib/Makefile b/external/bsd/libpcap/lib/Makefile
index 154d67b1665..85c2cba369b 100644
--- a/external/bsd/libpcap/lib/Makefile
+++ b/external/bsd/libpcap/lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2020/03/29 19:50:46 christos Exp $
+# $NetBSD: Makefile,v 1.30 2023/06/03 09:09:04 lukem Exp $
USE_SHLIBDIR=yes
.include <bsd.init.mk>
@@ -166,10 +166,10 @@ 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.pcap.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.pcap-bpf.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.pcap-new.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.pcap-rpcap.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.pcap.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.pcap-bpf.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.pcap-new.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.pcap-rpcap.c+= ${CC_WNO_FORMAT_TRUNCATION}
CWARNFLAGS.clang+= -Wno-format-extra-args \
-Wno-unneeded-internal-declaration
diff --git a/external/bsd/mdocml/bin/mandoc/Makefile b/external/bsd/mdocml/bin/mandoc/Makefile
index 221ed8c3748..8433c144c30 100644
--- a/external/bsd/mdocml/bin/mandoc/Makefile
+++ b/external/bsd/mdocml/bin/mandoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2022/10/31 09:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2023/06/03 09:09:04 lukem Exp $
.include <bsd.own.mk>
@@ -46,6 +46,6 @@ SRCS+= ${SRCS.libmandoc} compat_strtonum.c
COPTS.man_term.c+= -Wno-error=array-bounds
-COPTS.tbl_term.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.tbl_term.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/external/bsd/ntp/bin/ntpd/Makefile b/external/bsd/ntp/bin/ntpd/Makefile
index 15e08f2ec04..8f44e642107 100644
--- a/external/bsd/ntp/bin/ntpd/Makefile
+++ b/external/bsd/ntp/bin/ntpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2023/06/03 08:52:54 lukem Exp $
+# $NetBSD: Makefile,v 1.31 2023/06/03 09:09:04 lukem Exp $
.include <bsd.own.mk>
@@ -89,12 +89,12 @@ YHEADER=1
COPTS.ntp_control.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-error=maybe-uninitialized :}
COPTS.ntp_loopfilter.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-error=restrict :}
-COPTS.ntp_loopfilter.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.ntp_crypto.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.refclock_jjy.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.refclock_parse.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.refclock_leitch.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.refclock_neoclock4x.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.ntp_loopfilter.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.ntp_crypto.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.refclock_jjy.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.refclock_parse.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.refclock_leitch.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.refclock_neoclock4x.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.ntp_io.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.ntp_crypto.c+= -Wno-error=deprecated-declarations
diff --git a/external/bsd/ntp/bin/ntpq/Makefile b/external/bsd/ntp/bin/ntpq/Makefile
index 16671864e48..a88b9198232 100644
--- a/external/bsd/ntp/bin/ntpq/Makefile
+++ b/external/bsd/ntp/bin/ntpq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/10/11 07:07:31 rin Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 09:09:04 lukem Exp $
.include <bsd.own.mk>
@@ -21,7 +21,7 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/sntp/libopts
.PATH: ${DIST}
-COPTS.ntpq.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.ntpq.c+= ${CC_WNO_STRINGOP_TRUNCATION}
CLEANFILES+=${MAN}
diff --git a/external/bsd/ntp/bin/sntp/Makefile b/external/bsd/ntp/bin/sntp/Makefile
index 22f9d96e010..9ef4c4f023d 100644
--- a/external/bsd/ntp/bin/sntp/Makefile
+++ b/external/bsd/ntp/bin/sntp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/05/09 20:51:14 christos Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 09:09:04 lukem Exp $
USE_FORT?= yes # network client/server
@@ -33,7 +33,7 @@ CPPFLAGS+= -DSAVENAME=\"/var/db/sntp.state\"
LDADD+= -L${LIBISC} -liscntp -levent -lm
DPADD+= ${LIBM} ${LIBEVENT}
-COPTS.utilities.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.utilities.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.crypto.c+= -Wno-error=deprecated-declarations
CLEANFILES+=${MAN}
diff --git a/external/bsd/ntp/lib/libntp/Makefile b/external/bsd/ntp/lib/libntp/Makefile
index 5b962513cc9..e4ec0b2f8b2 100644
--- a/external/bsd/ntp/lib/libntp/Makefile
+++ b/external/bsd/ntp/lib/libntp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2023/05/09 20:39:24 christos Exp $
+# $NetBSD: Makefile,v 1.27 2023/06/03 09:09:04 lukem Exp $
LIBISPRIVATE=yes
@@ -101,7 +101,7 @@ CPPFLAGS.ntp_calendar.c += -DMKREPRO_DATE=\"${MKREPRO_DATE:Q}\"
CPPFLAGS.ntp_calendar.c += -DMKREPRO_TIME=\"${MKREPRO_TIME:Q}\"
.endif
-COPTS.timetoa.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.timetoa.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.socktoa.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :}
COPTS.socktohost.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :}
diff --git a/external/bsd/ntp/lib/libopts/Makefile b/external/bsd/ntp/lib/libopts/Makefile
index e6a86b82716..7b8115193e0 100644
--- a/external/bsd/ntp/lib/libopts/Makefile
+++ b/external/bsd/ntp/lib/libopts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/04/12 06:08:30 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 09:09:04 lukem Exp $
LIBISPRIVATE=yes
@@ -20,6 +20,6 @@ COPTS.libopts.c+= -DPOSIX_SHELL="\"/bin/sh\"" -Wno-format-nonliteral
COPTS.libopts.c+= ${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
COPTS.libopts.c+= ${${ACTIVE_CC} == "clang":? -Wno-format :}
-COPTS.libopts.c+= ${GCC_NO_FORMAT_OVERFLOW}
+COPTS.libopts.c+= ${CC_WNO_FORMAT_OVERFLOW}
.include <bsd.lib.mk>
diff --git a/external/bsd/openldap/lib/liblber/Makefile b/external/bsd/openldap/lib/liblber/Makefile
index fda92837e65..3c25766684b 100644
--- a/external/bsd/openldap/lib/liblber/Makefile
+++ b/external/bsd/openldap/lib/liblber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/04/12 06:08:30 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 09:09:05 lukem Exp $
USE_FORT?= yes
@@ -58,6 +58,6 @@ MLINKS+= lber-types.3 ber_bvarray_add.3 \
lber-types.3 ber_str2bv.3
# GCC 10 is wrong here.
-COPTS.memory.c+= ${GCC_NO_RETURN_LOCAL_ADDR}
+COPTS.memory.c+= ${CC_WNO_RETURN_LOCAL_ADDR}
.include <bsd.lib.mk>
diff --git a/external/bsd/openldap/lib/libldap/Makefile.libldap b/external/bsd/openldap/lib/libldap/Makefile.libldap
index 0acbf37d0be..dce983b790e 100644
--- a/external/bsd/openldap/lib/libldap/Makefile.libldap
+++ b/external/bsd/openldap/lib/libldap/Makefile.libldap
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libldap,v 1.14 2023/05/09 01:21:09 christos Exp $
+# $NetBSD: Makefile.libldap,v 1.15 2023/06/03 09:09:05 lukem Exp $
.include "../../openldap.mk"
@@ -34,4 +34,4 @@ LIBDPLIBS+= gssapi ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libgssapi
LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl
-COPTS.charray.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.charray.c+= ${CC_WNO_STRINGOP_OVERFLOW}
diff --git a/external/bsd/pdisk/bin/Makefile b/external/bsd/pdisk/bin/Makefile
index 8c42dcb50ba..07252dd4b93 100644
--- a/external/bsd/pdisk/bin/Makefile
+++ b/external/bsd/pdisk/bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/10/13 07:28:07 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/03 09:09:05 lukem Exp $
.include <bsd.own.mk>
WARNS=5
@@ -26,7 +26,7 @@ COPTS.pathname.c+= -Wno-implicit-fallthrough
COPTS.pdisk.c+= -Wno-implicit-fallthrough
.endif
-COPTS.partition_map.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.pdisk.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.partition_map.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.pdisk.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/external/bsd/ppp/usr.sbin/pppd/Makefile b/external/bsd/ppp/usr.sbin/pppd/Makefile
index 4ec1a71f2ea..ef90bba3ef5 100644
--- a/external/bsd/ppp/usr.sbin/pppd/Makefile
+++ b/external/bsd/ppp/usr.sbin/pppd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:07 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/03 09:09:05 lukem Exp $
.include "../Makefile.inc"
@@ -39,6 +39,6 @@ COPTS.${f}.c+= -Wno-pointer-sign
CWARNFLAGS.clang+= -Wno-tautological-compare
-COPTS.session.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.session.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/external/bsd/ppp/usr.sbin/pppstats/Makefile b/external/bsd/ppp/usr.sbin/pppstats/Makefile
index e8e108e4493..412daa72f00 100644
--- a/external/bsd/ppp/usr.sbin/pppstats/Makefile
+++ b/external/bsd/ppp/usr.sbin/pppstats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:07 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/03 09:09:05 lukem Exp $
.include "../Makefile.inc"
@@ -9,6 +9,6 @@ MAN= pppstats.8
LINKS= ${BINDIR}/pppstats ${BINDIR}/slstats
MLINKS= pppstats.8 slstats.8
-COPTS.pppstats.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.pppstats.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/external/bsd/tcpdump/bin/Makefile b/external/bsd/tcpdump/bin/Makefile
index 30eb0bfa830..d82f0d2b61b 100644
--- a/external/bsd/tcpdump/bin/Makefile
+++ b/external/bsd/tcpdump/bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2023/06/03 08:52:54 lukem Exp $
+# $NetBSD: Makefile,v 1.24 2023/06/03 09:09:05 lukem Exp $
WARNS?= 1 # XXX: need to cleanup later
@@ -207,7 +207,7 @@ tcpdump.8: tcpdump.1.in
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
-COPTS.print-bgp.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.print-bgp.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.signature.c+= -Wno-error=deprecated-declarations
COPTS.print-tcp.c+= -Wno-error=deprecated-declarations
diff --git a/external/bsd/tmux/usr.bin/tmux/Makefile b/external/bsd/tmux/usr.bin/tmux/Makefile
index e7b09d72305..76d7ab949e6 100644
--- a/external/bsd/tmux/usr.bin/tmux/Makefile
+++ b/external/bsd/tmux/usr.bin/tmux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2022/01/23 16:47:46 christos Exp $
+# $NetBSD: Makefile,v 1.29 2023/06/03 09:09:05 lukem Exp $
.include <bsd.own.mk>
@@ -240,7 +240,7 @@ LDADD+= -levent -lterminfo -lutil -lm
DPADD+= ${LIBEVENT} ${LIBTERMINFO} ${LIBUTIL}
COPTS.format.c += -Wno-format-nonliteral
-COPTS.utempter.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.window-copy.c+= ${GCC_NO_MAYBE_UNINITIALIZED}
+COPTS.utempter.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.window-copy.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
.include <bsd.prog.mk>
diff --git a/external/bsd/top/bin/Makefile b/external/bsd/top/bin/Makefile
index c0f1528a455..ed58954bb0a 100644
--- a/external/bsd/top/bin/Makefile
+++ b/external/bsd/top/bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/04/13 01:11:05 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 09:09:05 lukem Exp $
.include <bsd.own.mk>
@@ -39,7 +39,7 @@ config.h: config.h.in
COPTS.display.c = -Wno-format-nonliteral
-COPTS.commands.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.commands.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
COPTS+= -fcommon
diff --git a/external/cddl/osnet/lib/libdtrace/Makefile b/external/cddl/osnet/lib/libdtrace/Makefile
index d640d6e2d6e..5a49c631ebf 100644
--- a/external/cddl/osnet/lib/libdtrace/Makefile
+++ b/external/cddl/osnet/lib/libdtrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2021/04/13 09:20:55 mrg Exp $
+# $NetBSD: Makefile,v 1.31 2023/06/03 09:09:05 lukem Exp $
# $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -85,8 +85,8 @@ COPTS.dt_printf.c += -Wno-stack-protector
COPTS.dt_program.c += -Wno-stack-protector
COPTS.dt_provider.c += -Wno-stack-protector
COPTS.dt_subr.c += -Wno-stack-protector
-COPTS.dt_lex.c += ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.dt_pid.c += ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.dt_lex.c += ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.dt_pid.c += ${CC_WNO_STRINGOP_TRUNCATION}
COPTS.dt_consume.c += -Wno-parentheses
COPTS.dt_consume.c += ${${ACTIVE_CC} == "gcc" :? -Wno-maybe-uninitialized :}
@@ -119,7 +119,7 @@ CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
.PATH: ${.CURDIR}/../../dist/lib/libdtrace/mips
.endif
-COPTS.dt_link.c += ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.dt_link.c += ${CC_WNO_FORMAT_TRUNCATION}
LFLAGS+=-l
diff --git a/external/cddl/osnet/usr.bin/ctfconvert/Makefile b/external/cddl/osnet/usr.bin/ctfconvert/Makefile
index 0ef1b24718c..187139ea595 100644
--- a/external/cddl/osnet/usr.bin/ctfconvert/Makefile
+++ b/external/cddl/osnet/usr.bin/ctfconvert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/04/13 09:28:42 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 09:09:06 lukem Exp $
# $FreeBSD: head/cddl/usr.bin/ctfconvert/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -34,9 +34,9 @@ SRCS= alist.c \
traverse.c \
util.c
-COPTS.dwarf.c += ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.dwarf.c += ${CC_WNO_STRINGOP_TRUNCATION}
COPTS.st_parse.c += -Wno-format-nonliteral
COPTS.util.c += -Wno-format-nonliteral
-COPTS.st_parse.c += ${GCC_NO_MAYBE_UNINITIALIZED}
+COPTS.st_parse.c += ${CC_WNO_MAYBE_UNINITIALIZED}
.include <bsd.prog.mk>
diff --git a/external/cddl/osnet/usr.bin/ctfmerge/Makefile b/external/cddl/osnet/usr.bin/ctfmerge/Makefile
index 34f4d2ed5c4..66ca98401d2 100644
--- a/external/cddl/osnet/usr.bin/ctfmerge/Makefile
+++ b/external/cddl/osnet/usr.bin/ctfmerge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/06/07 23:26:54 fox Exp $
+# $NetBSD: Makefile,v 1.12 2023/06/03 09:09:06 lukem Exp $
# $FreeBSD: head/cddl/usr.bin/ctfmerge/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -36,6 +36,6 @@ LDADD+=-lpthread
DPADD+=${LIBPTHREAD}
.endif
-COPTS.ctfmerge.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.ctfmerge.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/external/gpl2/groff/bin/troff/Makefile b/external/gpl2/groff/bin/troff/Makefile
index 46022684ba9..0c121a2c66f 100644
--- a/external/gpl2/groff/bin/troff/Makefile
+++ b/external/gpl2/groff/bin/troff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 09:09:06 lukem Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
@@ -15,7 +15,7 @@ USETBL=
CWARNFLAGS.clang+= -Wno-format-security
-COPTS.input.cpp+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.input.cpp+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.prog.mk>
diff --git a/external/gpl2/lvm2/lib/libdevmapper/Makefile b/external/gpl2/lvm2/lib/libdevmapper/Makefile
index 369d812fbb2..4cee1308744 100644
--- a/external/gpl2/lvm2/lib/libdevmapper/Makefile
+++ b/external/gpl2/lvm2/lib/libdevmapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/04/12 02:54:08 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2023/06/03 09:09:06 lukem Exp $
USE_SHLIBDIR= yes
USE_FORT?= no
@@ -46,7 +46,7 @@ COPTS.libdm-nbsd-iface.c+= -O0
.PATH: ${LIBDEVMAPPER_DISTDIR}/regex
.PATH: ${LIBDEVMAPPER_DISTDIR}/ioctl
-COPTS.libdm-common.c += ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.fs.c += ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.libdm-common.c += ${CC_WNO_STRINGOP_OVERFLOW}
+COPTS.fs.c += ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.lib.mk>
diff --git a/external/gpl2/lvm2/lib/liblvm/Makefile b/external/gpl2/lvm2/lib/liblvm/Makefile
index b709f351d29..e59a63e3239 100644
--- a/external/gpl2/lvm2/lib/liblvm/Makefile
+++ b/external/gpl2/lvm2/lib/liblvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/04/12 02:54:08 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 09:09:06 lukem Exp $
LIBISPRIVATE= yes
@@ -24,7 +24,7 @@ CPPFLAGS+= -Wno-stack-protector
.endif
CPPFLAGS.imLcLkup.c=-Wno-error
-COPTS.fs.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.fs.c+= ${CC_WNO_STRINGOP_OVERFLOW}
SRCS+= activate.c lvmcache.c toolcontext.c config.c btree.c \
str_list.c dev-cache.c dev-io.c dev-md.c device.c dev-swap.c \
diff --git a/external/gpl2/xcvs/bin/xcvs/Makefile b/external/gpl2/xcvs/bin/xcvs/Makefile
index 37538604e8c..0d488d060ef 100644
--- a/external/gpl2/xcvs/bin/xcvs/Makefile
+++ b/external/gpl2/xcvs/bin/xcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 09:09:06 lukem Exp $
.include "${.CURDIR}/../../Makefile.inc"
PROG= xcvs
@@ -33,12 +33,12 @@ SRCS+= gssapi-client.c
DPADD+= ${LIBCRYPT} ${LIBZ}
LDADD+= -lcrypt -lz
-COPTS.commit.c+= ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.logmsg.c+= ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.ls.c+= ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.input.c+= ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.tag.c+= ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.subr.c+= ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.filesubr.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.commit.c+= ${CC_WNO_STRINGOP_OVERFLOW}
+COPTS.logmsg.c+= ${CC_WNO_STRINGOP_OVERFLOW}
+COPTS.ls.c+= ${CC_WNO_STRINGOP_OVERFLOW}
+COPTS.input.c+= ${CC_WNO_STRINGOP_OVERFLOW}
+COPTS.tag.c+= ${CC_WNO_STRINGOP_OVERFLOW}
+COPTS.subr.c+= ${CC_WNO_STRINGOP_OVERFLOW}
+COPTS.filesubr.c+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.prog.mk>
diff --git a/external/gpl3/gcc.old/README.warnings b/external/gpl3/gcc.old/README.warnings
index 14e8952cabf..2528d9e183c 100644
--- a/external/gpl3/gcc.old/README.warnings
+++ b/external/gpl3/gcc.old/README.warnings
@@ -1,4 +1,4 @@
-$NetBSD: README.warnings,v 1.3 2023/06/03 08:52:54 lukem Exp $
+$NetBSD: README.warnings,v 1.4 2023/06/03 09:09:06 lukem Exp $
What to do about GCC warnings and NetBSD.
@@ -13,15 +13,15 @@ modified for updates to warnings and new warnings.
<bsd.own.mk> provides several variables for use in Makefiles:
- COPTS.foo.c += ${GCC_NO_FORMAT_TRUNCATION}
- COPTS.foo.c += ${GCC_NO_FORMAT_OVERFLOW}
- COPTS.foo.c += ${GCC_NO_STRINGOP_OVERFLOW}
- COPTS.foo.c += ${GCC_NO_STRINGOP_TRUNCATION}
- COPTS.foo.c += ${GCC_NO_CAST_FUNCTION_TYPE}
- COPTS.foo.c += ${GCC_NO_IMPLICIT_FALLTHRU}
+ COPTS.foo.c += ${CC_WNO_FORMAT_TRUNCATION}
+ COPTS.foo.c += ${CC_WNO_FORMAT_OVERFLOW}
+ COPTS.foo.c += ${CC_WNO_STRINGOP_OVERFLOW}
+ COPTS.foo.c += ${CC_WNO_STRINGOP_TRUNCATION}
+ COPTS.foo.c += ${CC_WNO_CAST_FUNCTION_TYPE}
+ COPTS.foo.c += ${CC_WNO_IMPLICIT_FALLTHROUGH}
COPTS.foo.c += ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
- COPTS.foo.c += ${GCC_NO_MAYBE_UNINITIALIZED}
- COPTS.foo.c += ${GCC_NO_RETURN_LOCAL_ADDR}
+ COPTS.foo.c += ${CC_WNO_MAYBE_UNINITIALIZED}
+ COPTS.foo.c += ${CC_WNO_RETURN_LOCAL_ADDR}
new GCC 10 warnings:
@@ -36,7 +36,7 @@ new GCC 10 warnings:
significantly enhanced in GCC 10, unfortunately, many of
the new instances are incorrect.
- bsd.own.mk variable: ${GCC_NO_MAYBE_UNINITIALIZED}
+ bsd.own.mk variable: ${CC_WNO_MAYBE_UNINITIALIZED}
-Wno-return-local-addr
@@ -44,7 +44,7 @@ new GCC 10 warnings:
10. Unfortunately, the new instances are failing to correctly
analyze code flow and miss that most of the are handled.
- bsd.own.mk variable: ${GCC_NO_RETURN_LOCAL_ADDR}
+ bsd.own.mk variable: ${CC_WNO_RETURN_LOCAL_ADDR}
new GCC 9 warnings:
@@ -68,7 +68,7 @@ new GCC 8 warnings:
general family of string functions (str*(), etc.), and has
similar issues of false positives.
- bsd.own.mk variable: ${GCC_NO_STRINGOP_TRUNCATION}
+ bsd.own.mk variable: ${CC_WNO_STRINGOP_TRUNCATION}
-Wcast-function-type
@@ -78,7 +78,7 @@ new GCC 8 warnings:
false positives, and hopefully this warning will become
more useful in the future. See __FPTRCAST().
- bsd.own.mk variable: ${GCC_NO_CAST_FUNCTION_TYPE}
+ bsd.own.mk variable: ${CC_WNO_CAST_FUNCTION_TYPE}
new GCC 7 warnings:
@@ -92,7 +92,7 @@ new GCC 7 warnings:
cases and should always be inspected, but false positives
are also seen.
- bsd.own.mk variable: ${GCC_NO_STRINGOP_OVERFLOW}
+ bsd.own.mk variable: ${CC_WNO_STRINGOP_OVERFLOW}
-Wformat-truncation
@@ -105,7 +105,7 @@ new GCC 7 warnings:
Code should always be manually inspected for this warning
as it does pick up real issues.
- bsd.own.mk variable: ${GCC_NO_FORMAT_TRUNCATION}
+ bsd.own.mk variable: ${CC_WNO_FORMAT_TRUNCATION}
-Wformat-overflow
@@ -117,7 +117,7 @@ new GCC 7 warnings:
Code should always be manually inspected for this warning
as it does pick up real issues.
- bsd.own.mk variable: ${GCC_NO_FORMAT_OVERFLOW}
+ bsd.own.mk variable: ${CC_WNO_FORMAT_OVERFLOW}
-Wimplicit-fallthrough
@@ -129,4 +129,4 @@ new GCC 7 warnings:
Code should always be manually inspected for this warning
as it does pick up real issues.
- bsd.own.mk variable: ${GCC_NO_IMPLICIT_FALLTHRU}
+ bsd.own.mk variable: ${CC_WNO_IMPLICIT_FALLTHROUGH}
diff --git a/external/gpl3/gcc.old/lib/libiberty/Makefile b/external/gpl3/gcc.old/lib/libiberty/Makefile
index e10f9f2773e..79598592efc 100644
--- a/external/gpl3/gcc.old/lib/libiberty/Makefile
+++ b/external/gpl3/gcc.old/lib/libiberty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2023/02/20 02:12:15 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2023/06/03 09:09:06 lukem Exp $
LIBISPRIVATE= yes
@@ -29,6 +29,6 @@ CWARNFLAGS.clang+= -Wno-unused-value
.PATH: ${DIST}/libiberty
-COPTS.dyn-string.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.dyn-string.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.lib.mk>
diff --git a/external/gpl3/gcc.old/usr.bin/common-target/Makefile b/external/gpl3/gcc.old/usr.bin/common-target/Makefile
index f73d3e4a64a..ba8954ec801 100644
--- a/external/gpl3/gcc.old/usr.bin/common-target/Makefile
+++ b/external/gpl3/gcc.old/usr.bin/common-target/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/05/19 23:28:21 lukem Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 09:09:06 lukem Exp $
HOSTPROG_CXX= 1
LIBISPRIVATE= yes
@@ -24,7 +24,7 @@ COPTS.opts-common.c+= -Wno-stack-protector
COPTS.rs6000-common.c+= -Wno-stack-protector
COPTS.arm-common.c+= -Wno-stack-protector
.if ${MACHINE_CPU} == "sh3"
-COPTS.opts.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.opts.c+= ${CC_WNO_FORMAT_TRUNCATION}
.endif
GENPROG_ERROR_DEPENDS=errors.lo
diff --git a/external/gpl3/gcc/README.warnings b/external/gpl3/gcc/README.warnings
index a6f4f35fc1c..10c203da936 100644
--- a/external/gpl3/gcc/README.warnings
+++ b/external/gpl3/gcc/README.warnings
@@ -1,4 +1,4 @@
-$NetBSD: README.warnings,v 1.2 2023/06/03 08:52:54 lukem Exp $
+$NetBSD: README.warnings,v 1.3 2023/06/03 09:09:07 lukem Exp $
What to do about GCC warnings and NetBSD.
@@ -13,15 +13,15 @@ modified for updates to warnings and new warnings.
<bsd.own.mk> provides several variables for use in Makefiles:
- COPTS.foo.c += ${GCC_NO_FORMAT_TRUNCATION}
- COPTS.foo.c += ${GCC_NO_FORMAT_OVERFLOW}
- COPTS.foo.c += ${GCC_NO_STRINGOP_OVERFLOW}
- COPTS.foo.c += ${GCC_NO_STRINGOP_TRUNCATION}
- COPTS.foo.c += ${GCC_NO_CAST_FUNCTION_TYPE}
- COPTS.foo.c += ${GCC_NO_IMPLICIT_FALLTHRU}
+ COPTS.foo.c += ${CC_WNO_FORMAT_TRUNCATION}
+ COPTS.foo.c += ${CC_WNO_FORMAT_OVERFLOW}
+ COPTS.foo.c += ${CC_WNO_STRINGOP_OVERFLOW}
+ COPTS.foo.c += ${CC_WNO_STRINGOP_TRUNCATION}
+ COPTS.foo.c += ${CC_WNO_CAST_FUNCTION_TYPE}
+ COPTS.foo.c += ${CC_WNO_IMPLICIT_FALLTHROUGH}
COPTS.foo.c += ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
- COPTS.foo.c += ${GCC_NO_MAYBE_UNINITIALIZED}
- COPTS.foo.c += ${GCC_NO_RETURN_LOCAL_ADDR}
+ COPTS.foo.c += ${CC_WNO_MAYBE_UNINITIALIZED}
+ COPTS.foo.c += ${CC_WNO_RETURN_LOCAL_ADDR}
new GCC 10 warnings:
@@ -36,7 +36,7 @@ new GCC 10 warnings:
significantly enhanced in GCC 10, unfortunately, many of
the new instances are incorrect.
- bsd.own.mk variable: ${GCC_NO_MAYBE_UNINITIALIZED}
+ bsd.own.mk variable: ${CC_WNO_MAYBE_UNINITIALIZED}
-Wno-return-local-addr
@@ -44,7 +44,7 @@ new GCC 10 warnings:
10. Unfortunately, the new instances are failing to correctly
analyze code flow and miss that most of the are handled.
- bsd.own.mk variable: ${GCC_NO_RETURN_LOCAL_ADDR}
+ bsd.own.mk variable: ${CC_WNO_RETURN_LOCAL_ADDR}
new GCC 9 warnings:
@@ -68,7 +68,7 @@ new GCC 8 warnings:
general family of string functions (str*(), etc.), and has
similar issues of false positives.
- bsd.own.mk variable: ${GCC_NO_STRINGOP_TRUNCATION}
+ bsd.own.mk variable: ${CC_WNO_STRINGOP_TRUNCATION}
-Wcast-function-type
@@ -78,7 +78,7 @@ new GCC 8 warnings:
false positives, and hopefully this warning will become
more useful in the future. See __FPTRCAST().
- bsd.own.mk variable: ${GCC_NO_CAST_FUNCTION_TYPE}
+ bsd.own.mk variable: ${CC_WNO_CAST_FUNCTION_TYPE}
new GCC 7 warnings:
@@ -92,7 +92,7 @@ new GCC 7 warnings:
cases and should always be inspected, but false positives
are also seen.
- bsd.own.mk variable: ${GCC_NO_STRINGOP_OVERFLOW}
+ bsd.own.mk variable: ${CC_WNO_STRINGOP_OVERFLOW}
-Wformat-truncation
@@ -105,7 +105,7 @@ new GCC 7 warnings:
Code should always be manually inspected for this warning
as it does pick up real issues.
- bsd.own.mk variable: ${GCC_NO_FORMAT_TRUNCATION}
+ bsd.own.mk variable: ${CC_WNO_FORMAT_TRUNCATION}
-Wformat-overflow
@@ -117,7 +117,7 @@ new GCC 7 warnings:
Code should always be manually inspected for this warning
as it does pick up real issues.
- bsd.own.mk variable: ${GCC_NO_FORMAT_OVERFLOW}
+ bsd.own.mk variable: ${CC_WNO_FORMAT_OVERFLOW}
-Wimplicit-fallthrough
@@ -129,4 +129,4 @@ new GCC 7 warnings:
Code should always be manually inspected for this warning
as it does pick up real issues.
- bsd.own.mk variable: ${GCC_NO_IMPLICIT_FALLTHRU}
+ bsd.own.mk variable: ${CC_WNO_IMPLICIT_FALLTHROUGH}
diff --git a/external/gpl3/gcc/lib/libiberty/Makefile b/external/gpl3/gcc/lib/libiberty/Makefile
index 980a27836e4..f285a93c2b1 100644
--- a/external/gpl3/gcc/lib/libiberty/Makefile
+++ b/external/gpl3/gcc/lib/libiberty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 09:09:07 lukem Exp $
LIBISPRIVATE= yes
@@ -29,6 +29,6 @@ CWARNFLAGS.clang+= -Wno-unused-value
.PATH: ${DIST}/libiberty
-COPTS.dyn-string.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.dyn-string.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.lib.mk>
diff --git a/external/gpl3/gcc/usr.bin/common-target/Makefile b/external/gpl3/gcc/usr.bin/common-target/Makefile
index 86e318d9191..b0a2ffac944 100644
--- a/external/gpl3/gcc/usr.bin/common-target/Makefile
+++ b/external/gpl3/gcc/usr.bin/common-target/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/05/19 23:28:20 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 09:09:07 lukem Exp $
HOSTPROG_CXX= 1
LIBISPRIVATE= yes
@@ -24,7 +24,7 @@ COPTS.opts-common.c+= -Wno-stack-protector
COPTS.rs6000-common.c+= -Wno-stack-protector
COPTS.arm-common.c+= -Wno-stack-protector
.if ${MACHINE_CPU} == "sh3"
-COPTS.opts.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.opts.c+= ${CC_WNO_FORMAT_TRUNCATION}
.endif
GENPROG_ERROR_DEPENDS=errors.lo
diff --git a/external/mit/lua/lib/liblua/Makefile b/external/mit/lua/lib/liblua/Makefile
index 33658d51af7..35c481e6b14 100644
--- a/external/mit/lua/lib/liblua/Makefile
+++ b/external/mit/lua/lib/liblua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/04/16 20:46:17 nikita Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 09:09:07 lukem Exp $
LIB= lua
LUA_CORE= lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c \
@@ -16,7 +16,7 @@ INCSDIR= /usr/include
CPPFLAGS+= -DLUA_USE_POSIX -DLUA_USE_DLOPEN
CWARNFLAGS.clang+= -Wno-empty-body -Wno-error=string-plus-int
-COPTS.lstring.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.lstring.c+= ${CC_WNO_STRINGOP_OVERFLOW}
LINTFLAGS+= -X 141 # integer overflow detected, op '<<'
LINTFLAGS+= -X 247 # pointer cast from 'pointer to struct
# GCObject' to 'pointer to union GCUnion' may
diff --git a/external/mit/xorg/bin/xauth/Makefile b/external/mit/xorg/bin/xauth/Makefile
index 97f88bc4c23..0adba9f33a3 100644
--- a/external/mit/xorg/bin/xauth/Makefile
+++ b/external/mit/xorg/bin/xauth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/10/28 09:43:58 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 09:09:07 lukem Exp $
.include <bsd.own.mk>
@@ -16,7 +16,7 @@ CPPFLAGS+= -DIPv6
.endif
CWARNFLAGS.clang= -Wno-empty-body
-COPTS.parsedpy.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.parsedpy.c+= ${CC_WNO_STRINGOP_OVERFLOW}
LDADD+= -lXau -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXAU} ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
diff --git a/external/mit/xorg/bin/xconsole/Makefile b/external/mit/xorg/bin/xconsole/Makefile
index 0ab9343e47e..4b4f5a2f407 100644
--- a/external/mit/xorg/bin/xconsole/Makefile
+++ b/external/mit/xorg/bin/xconsole/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:07 lukem Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ DPADD+= ${LIBUTIL} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
CPPFLAGS+=-DHAS_OPENPTY -DHAVE_UTIL_H
-COPTS.xconsole.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.xconsole.c+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.x11.mk>
.include <bsd.prog.mk>
diff --git a/external/mit/xorg/bin/xmh/Makefile b/external/mit/xorg/bin/xmh/Makefile
index a8a2bedb109..55dccbb83ce 100644
--- a/external/mit/xorg/bin/xmh/Makefile
+++ b/external/mit/xorg/bin/xmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 09:09:07 lukem Exp $
.include <bsd.own.mk>
@@ -23,7 +23,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
CWARNFLAGS.clang+= -Wno-format
-COPTS+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.x11.mk>
.include <bsd.prog.mk>
diff --git a/external/mit/xorg/lib/libX11/Makefile.ximcp b/external/mit/xorg/lib/libX11/Makefile.ximcp
index e36399191be..23b17cbfbc4 100644
--- a/external/mit/xorg/lib/libX11/Makefile.ximcp
+++ b/external/mit/xorg/lib/libX11/Makefile.ximcp
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ximcp,v 1.5 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile.ximcp,v 1.6 2023/06/03 09:09:07 lukem Exp $
.PATH: ${X11SRCDIR.X11}/modules/im/ximcp
SRCS.ximcp= \
@@ -45,4 +45,4 @@ COPTS.imTrans.c= -Wno-error
COPTS.imLcLkup.c= -Wno-stack-protector
COPTS.imInsClbk.c= -Wno-unused-value
-COPTS.imDefIm.c= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.imDefIm.c= ${CC_WNO_STRINGOP_OVERFLOW}
diff --git a/external/mit/xorg/lib/libX11/Makefile.xlibi18n b/external/mit/xorg/lib/libX11/Makefile.xlibi18n
index 22f374d04ef..a366508e0cf 100644
--- a/external/mit/xorg/lib/libX11/Makefile.xlibi18n
+++ b/external/mit/xorg/lib/libX11/Makefile.xlibi18n
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlibi18n,v 1.3 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile.xlibi18n,v 1.4 2023/06/03 09:09:07 lukem Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/gen
SRCS.xlibi18n= lcGenConv.c
@@ -11,4 +11,4 @@ CPPFLAGS+= \
${XLOCALE.DEFINES} \
-DHASXDMAUTH
-COPTS.lcGenConv.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.lcGenConv.c+= ${CC_WNO_STRINGOP_OVERFLOW}
diff --git a/external/mit/xorg/lib/libXvMCW/Makefile b/external/mit/xorg/lib/libXvMCW/Makefile
index 1564532786a..8b8fdb3b0b2 100644
--- a/external/mit/xorg/lib/libXvMCW/Makefile
+++ b/external/mit/xorg/lib/libXvMCW/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/02/23 09:24:12 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:08 lukem Exp $
.include <bsd.own.mk>
@@ -17,7 +17,7 @@ CPPFLAGS+= -I${X11SRCDIR.XvMC}/include
LIBDPLIBS= Xext ${.CURDIR}/../libXext \
X11 ${.CURDIR}/../libX11/dynamic
-COPTS.XvMCWrapper.c= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.XvMCWrapper.c= ${CC_WNO_STRINGOP_OVERFLOW}
# XXX
#PKGDIST= xvmc-wrapper
diff --git a/external/mit/xorg/lib/libxkbfile/Makefile b/external/mit/xorg/lib/libxkbfile/Makefile
index e2a1ee190b3..affc6e3a6bd 100644
--- a/external/mit/xorg/lib/libxkbfile/Makefile
+++ b/external/mit/xorg/lib/libxkbfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/10/29 21:06:15 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 09:09:08 lukem Exp $
.include <bsd.own.mk>
@@ -20,7 +20,7 @@ LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic
PKGCONFIG= xkbfile
-COPTS.xkbatom.c= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.xkbatom.c= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.x11.mk>
.include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/drivers/xf86-video-sis/Makefile b/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
index 9d01f9cf506..47283484fb4 100644
--- a/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
+++ b/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/10/13 07:28:09 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2023/06/03 09:09:08 lukem Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -24,7 +24,7 @@ CWARNFLAGS.clang+= -Wno-parentheses
# XXX
COPTS.sis_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
-COPTS.sis_utility.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :} ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.sis_utility.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :} ${CC_WNO_STRINGOP_OVERFLOW}
COPTS.initextx.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.sis_driver.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
COPTS.sis_utility.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
diff --git a/external/mpl/bind/bin/dnssec/dnssec-verify/Makefile b/external/mpl/bind/bin/dnssec/dnssec-verify/Makefile
index 402d0ebb7d0..f26418f5344 100644
--- a/external/mpl/bind/bin/dnssec/dnssec-verify/Makefile
+++ b/external/mpl/bind/bin/dnssec/dnssec-verify/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:09 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/03 09:09:08 lukem Exp $
BASE= ${.CURDIR:T}
.include "${.CURDIR}/../Makefile.inc"
-COPTS.discover.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.discover.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/external/mpl/dhcp/bin/relay/Makefile b/external/mpl/dhcp/bin/relay/Makefile
index 71ff354b84a..e256ce4b1cd 100644
--- a/external/mpl/dhcp/bin/relay/Makefile
+++ b/external/mpl/dhcp/bin/relay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:09 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/03 09:09:08 lukem Exp $
SRCS = dhcrelay.c
PROG = dhcrelay
@@ -6,6 +6,6 @@ MAN = dhcrelay.8
DHCPSRCDIR= relay
-COPTS.dhcrelay.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.dhcrelay.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/external/mpl/dhcp/bin/server/Makefile b/external/mpl/dhcp/bin/server/Makefile
index f0310509a51..1a35e2f50fd 100644
--- a/external/mpl/dhcp/bin/server/Makefile
+++ b/external/mpl/dhcp/bin/server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/04/13 06:25:48 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 09:09:08 lukem Exp $
.include <bsd.own.mk>
@@ -21,7 +21,7 @@ COPTS.ddns.c +=-Wno-stringop-overflow
COPTS.mdb6.c += ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
COPTS.omapi.c += -Wno-stack-protector
-COPTS.confpars.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.mdb6.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.confpars.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.mdb6.c+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.prog.mk>
diff --git a/external/mpl/dhcp/lib/common/Makefile b/external/mpl/dhcp/lib/common/Makefile
index bb853d21aa1..3dd1504d316 100644
--- a/external/mpl/dhcp/lib/common/Makefile
+++ b/external/mpl/dhcp/lib/common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:09 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/03 09:09:08 lukem Exp $
LIBISPRIVATE= yes
@@ -11,7 +11,7 @@ MAN = dhcp-options.5 dhcp-eval.5
DHCPSRCDIR= common
-COPTS.discover.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.parse.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.discover.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.parse.c+= ${CC_WNO_FORMAT_TRUNCATION} ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.lib.mk>
diff --git a/external/public-domain/sqlite/lib/Makefile b/external/public-domain/sqlite/lib/Makefile
index 6900160dd6c..4273bee7c5e 100644
--- a/external/public-domain/sqlite/lib/Makefile
+++ b/external/public-domain/sqlite/lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/04/12 06:08:31 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/03 09:09:08 lukem Exp $
LIB= sqlite3
INCS= sqlite3.h sqlite3ext.h
@@ -20,7 +20,7 @@ FILESDIR_sqlite3.pc= /usr/lib/pkgconfig
CLEANFILES+=sqlite3.pc
CWARNFLAGS.clang+= -Wno-error=implicit-int-float-conversion
-COPTS.sqlite3.c+= ${GCC_NO_RETURN_LOCAL_ADDR}
+COPTS.sqlite3.c+= ${CC_WNO_RETURN_LOCAL_ADDR}
.include <bsd.own.mk>
diff --git a/external/public-domain/xz/bin/xz/Makefile b/external/public-domain/xz/bin/xz/Makefile
index 8abe5046cc1..a4911537a5c 100644
--- a/external/public-domain/xz/bin/xz/Makefile
+++ b/external/public-domain/xz/bin/xz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/04/12 02:54:08 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 09:09:08 lukem Exp $
PROG= xz
BINDIR= /usr/bin
@@ -52,4 +52,4 @@ LDADD+= -llzma -lintl -lpthread
.include <bsd.prog.mk>
.endif
-COPTS.message.c += ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.message.c += ${CC_WNO_FORMAT_TRUNCATION}
diff --git a/external/zlib/pigz/bin/pigz/Makefile b/external/zlib/pigz/bin/pigz/Makefile
index 1f745dad91f..d3091719069 100644
--- a/external/zlib/pigz/bin/pigz/Makefile
+++ b/external/zlib/pigz/bin/pigz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:09 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2023/06/03 09:09:09 lukem Exp $
.include <bsd.own.mk>
@@ -60,5 +60,5 @@ GZIPDIST= ${NETBSDSRCDIR}/usr.bin/gzip
.endif
.if !defined(HOSTPROG)
-COPTS.pigz.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.pigz.c+= ${CC_WNO_STRINGOP_OVERFLOW}
.endif
diff --git a/games/hack/Makefile b/games/hack/Makefile
index ec9a65219c6..e7e74ee6e6a 100644
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2020/02/08 00:59:55 fox Exp $
+# $NetBSD: Makefile,v 1.48 2023/06/03 09:09:09 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 4/27/95
.include <bsd.own.mk>
@@ -39,7 +39,7 @@ hack.h: hack.onames.h
COPTS.hack.mon.c+= -Wno-format-nonliteral
COPTS.hack.rip.c+= -Wno-format-nonliteral
-COPTS.hack.end.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.hack.end.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.if !exists(${DESTDIR}${FILESDIR}/perm)
afterinstall: clobber
@@ -55,7 +55,7 @@ clobber:
${_MKMSG_REMOVE} "${DESTDIR}/var/games/hackdir/bones*"
rm -f ${DESTDIR}/var/games/hackdir/bones*
-COPTS.hack.objnam.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.hack.pager.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.hack.objnam.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_STRINGOP_OVERFLOW}
+COPTS.hack.pager.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/games/hunt/hunt/Makefile b/games/hunt/hunt/Makefile
index e7584aa1fdd..a0ff46853a0 100644
--- a/games/hunt/hunt/Makefile
+++ b/games/hunt/hunt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/10/13 07:28:09 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 09:09:09 lukem Exp $
PROG= hunt
SRCS= connect.c hunt.c otto.c playit.c server.c
@@ -9,6 +9,6 @@ HIDEGAME=hidegame
CPPFLAGS+=-I${.CURDIR}/../include
-COPTS.hunt.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.hunt.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/games/hunt/huntd/Makefile b/games/hunt/huntd/Makefile
index d64b1dcb9ce..a1f36ea50a7 100644
--- a/games/hunt/huntd/Makefile
+++ b/games/hunt/huntd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/04/15 01:55:21 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 09:09:09 lukem Exp $
PROG= huntd
SRCS= answer.c draw.c driver.c execute.c expl.c \
@@ -10,8 +10,8 @@ CPPFLAGS+=-I${.CURDIR}/../include
.include <bsd.own.mk>
# Appears wrong - should not exceed bounds of array.
-COPTS.answer.c+= ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.shots.c+= ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.driver.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.answer.c+= ${CC_WNO_STRINGOP_OVERFLOW}
+COPTS.shots.c+= ${CC_WNO_STRINGOP_OVERFLOW}
+COPTS.driver.c+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.prog.mk>
diff --git a/games/rogue/Makefile b/games/rogue/Makefile
index e46f5173fd1..15551a13e14 100644
--- a/games/rogue/Makefile
+++ b/games/rogue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/10/13 07:28:09 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2023/06/03 09:09:09 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= rogue
@@ -14,7 +14,7 @@ MAN= rogue.6
SUBDIR.roff+=USD.doc
-COPTS.score.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.score.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
diff --git a/games/tetris/Makefile b/games/tetris/Makefile
index 431122409f6..46427a9bcab 100644
--- a/games/tetris/Makefile
+++ b/games/tetris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/09/06 10:51:20 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 09:09:09 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= tetris
@@ -9,7 +9,7 @@ LDADD= -lterminfo
HIDEGAME=hidegame
SETGIDGAME=yes
-COPTS.tetris.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.scores.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.tetris.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.scores.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/lib/libc/citrus/Makefile.inc b/lib/libc/citrus/Makefile.inc
index ba563037ded..ed821c333e5 100644
--- a/lib/libc/citrus/Makefile.inc
+++ b/lib/libc/citrus/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2019/10/13 07:28:10 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.10 2023/06/03 09:09:09 lukem Exp $
# sources
.PATH: ${ARCHDIR}/citrus ${.CURDIR}/citrus
@@ -24,6 +24,6 @@ CPPFLAGS.citrus_lc_numeric.c+= -I${LIBCDIR}/locale
CPPFLAGS.citrus_lc_time.c+= -I${LIBCDIR}/locale
CPPFLAGS.citrus_lc_messages.c+= -I${LIBCDIR}/locale
-COPTS.citrus_iconv.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.citrus_csmapper.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.citrus_iconv.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.citrus_csmapper.c+= ${CC_WNO_FORMAT_TRUNCATION}
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index b507b9eef86..ad6b24e3e62 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.93 2023/06/03 08:52:54 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.94 2023/06/03 09:09:09 lukem Exp $
# @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
# net sources
@@ -151,5 +151,5 @@ MAN+= sctp_bindx.3 sctp_connectx.3 sctp_freepaddrs.3 sctp_getaddrlen.3 \
sctp_getassocid.3 sctp_getpaddrs.3 sctp_opt_info.3 sctp_peeloff.3 \
sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3
-COPTS.getaddrinfo.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.getaddrinfo.c+= ${CC_WNO_STRINGOP_OVERFLOW}
COPTS.sctp_sys_calls.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
diff --git a/lib/libc/resolv/Makefile.inc b/lib/libc/resolv/Makefile.inc
index fdb77d55f23..53b9168e389 100644
--- a/lib/libc/resolv/Makefile.inc
+++ b/lib/libc/resolv/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2019/10/13 07:28:10 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.9 2023/06/03 09:09:09 lukem Exp $
# net sources
.PATH: ${.CURDIR}/resolv
@@ -10,4 +10,4 @@ SRCS+= h_errno.c herror.c res_comp.c res_data.c res_debug.c \
# For COMPAT__RES
SRCS+= res_compat.c
-COPTS.res_query.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.res_query.c+= ${CC_WNO_STRINGOP_OVERFLOW}
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index f1eacb975e2..46859be495f 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.27 2020/10/03 18:31:29 christos Exp $
+# $NetBSD: Makefile.inc,v 1.28 2023/06/03 09:09:10 lukem Exp $
# librpc sources
.PATH: ${.CURDIR}/rpc
@@ -169,12 +169,12 @@ MLINKS+= bindresvport.3 bindresvport_sa.3 \
xdr.3 xdr_void.3 \
xdr.3 xdr_wrapstring.3
-COPTS.clnt_bcast.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.clnt_generic.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.clnt_vc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.rpcb_clnt.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.xdr_sizeof.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.svc_simple.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.pmap_getmaps.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.rpc_generic.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.getrpcent.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.clnt_bcast.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.clnt_generic.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.clnt_vc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_clnt.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.xdr_sizeof.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.svc_simple.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.pmap_getmaps.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.rpc_generic.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.getrpcent.c+= ${CC_WNO_STRINGOP_TRUNCATION}
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index 105a6a92e0e..48372c8ce00 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2019/10/13 07:28:10 mrg Exp $
+# $NetBSD: Makefile,v 1.67 2023/06/03 09:09:10 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
@@ -138,6 +138,6 @@ COPTS.tokenizer.c+= -Wno-cast-qual
COPTS.tokenizern.c+= -Wno-cast-qual
.endif
-COPTS.history.c+= ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.historyn.c+= ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.readline.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.history.c+= ${CC_WNO_STRINGOP_OVERFLOW}
+COPTS.historyn.c+= ${CC_WNO_STRINGOP_OVERFLOW}
+COPTS.readline.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_STRINGOP_OVERFLOW}
diff --git a/lib/libisns/Makefile b/lib/libisns/Makefile
index e8e7e318717..1764cd92f03 100644
--- a/lib/libisns/Makefile
+++ b/lib/libisns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/07/31 12:40:35 mlelstv Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 09:09:10 lukem Exp $
.include <bsd.own.mk>
@@ -17,6 +17,6 @@ WARNS?= 5
LIBDPLIBS+= pthread ${.CURDIR}/../libpthread
-COPTS.isns.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.isns.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.lib.mk>
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index 48636a23804..1b0ce790cee 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2021/11/01 15:56:53 christos Exp $
+# $NetBSD: Makefile,v 1.31 2023/06/03 09:09:10 lukem Exp $
#-
# Copyright (c) 1998 Juniper Networks, Inc.
# All rights reserved.
@@ -212,7 +212,7 @@ openpam_static_modules.o: openpam_static.o ${STATIC_MODULE_LIBS}
openpam_static.o ${STATIC_MODULE_LIBS}
CWARNFLAGS.clang+= -Wno-error=tautological-pointer-compare
-COPTS.openpam_dynamic.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.openpam_dynamic.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.lib.mk>
.PATH.h: ${DIST}/include
diff --git a/lib/libpam/modules/pam_lastlog/Makefile b/lib/libpam/modules/pam_lastlog/Makefile
index 24d0a9a1973..82d943b6b65 100644
--- a/lib/libpam/modules/pam_lastlog/Makefile
+++ b/lib/libpam/modules/pam_lastlog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:10 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2023/06/03 09:09:10 lukem Exp $
# Copyright 2001 Mark R V Murray
# All rights reserved.
#
@@ -35,4 +35,4 @@ LIBDPLIBS+= util ${.CURDIR}/../../../libutil
.include "${.CURDIR}/../mod.mk"
-COPTS.pam_lastlog.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.pam_lastlog.c+= ${CC_WNO_STRINGOP_TRUNCATION}
diff --git a/lib/librump/Makefile b/lib/librump/Makefile
index 3f5a2491082..ca2b85840da 100644
--- a/lib/librump/Makefile
+++ b/lib/librump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/11/01 21:37:32 nia Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 09:09:10 lukem Exp $
#
NOFULLRELRO= yes
@@ -9,9 +9,9 @@ LIBDPLIBS+= rumpuser ${.CURDIR}/../librumpuser
WARNS= 3 # XXX: kernel isn't ready for -Wsign-compare
-COPTS.kern_hook.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.rump.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.subr_pool.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.subr_vmem.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.kern_hook.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.rump.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.subr_pool.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.subr_vmem.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include "${RUMPTOP}/librump/rumpkern/Makefile.rumpkern"
diff --git a/lib/librumpclient/Makefile b/lib/librumpclient/Makefile
index 74b410a3a94..286e1349d6e 100644
--- a/lib/librumpclient/Makefile
+++ b/lib/librumpclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/11/01 21:37:32 nia Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 09:09:10 lukem Exp $
#
NOFULLRELRO= yes
@@ -35,6 +35,6 @@ COPTS.rump_syscalls.c+= -fno-strict-aliasing
@ln -s ${NETBSDSRCDIR}/sys/sys srcsys
.endif
-COPTS.rumpclient.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rumpclient.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.lib.mk>
diff --git a/lib/librumpres/Makefile b/lib/librumpres/Makefile
index 19c9be38629..fedf1e37d0b 100644
--- a/lib/librumpres/Makefile
+++ b/lib/librumpres/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/11/01 21:37:33 nia Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 09:09:10 lukem Exp $
USE_FORT?= yes
USE_SHLIBDIR= yes
@@ -23,6 +23,6 @@ SRCS+= if_indextoname.c if_nametoindex.c
#SRCS+= gethnamaddr.c sethostent.c
CPPFLAGS+= -DRUMP_ACTION
-COPTS.getaddrinfo.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.getaddrinfo.c+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.lib.mk>
diff --git a/lib/librumpuser/Makefile b/lib/librumpuser/Makefile
index be67757e40d..2518dc9a20c 100644
--- a/lib/librumpuser/Makefile
+++ b/lib/librumpuser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2021/11/01 21:37:33 nia Exp $
+# $NetBSD: Makefile,v 1.30 2023/06/03 09:09:10 lukem Exp $
#
NOFULLRELRO= yes
@@ -56,6 +56,6 @@ INCS= rumpuser_component.h rumpuser_port.h
CPPFLAGS+= -D_REENTRANT
-COPTS.rumpuser_sp.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rumpuser_sp.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.lib.mk>
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 1860e5cd883..fddcc52eeb4 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2023/03/28 14:44:34 rillig Exp $
+# $NetBSD: Makefile,v 1.87 2023/06/03 09:09:11 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
@@ -40,8 +40,8 @@ CPPFLAGS.sockaddr_snprintf.c+=-DHAVE_NETATALK_AT_H
CPPFLAGS.sockaddr_snprintf.c+=-DHAVE_NET_IF_DL_H
LINTFLAGS.if_media.c+= -X 351 # 'extern' declaration outside header
-COPTS.logwtmp.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.logwtmpx.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.logwtmp.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.logwtmpx.c+= ${CC_WNO_STRINGOP_TRUNCATION}
YPREFIX=__pd
.PATH: ${NETBSDSRCDIR}/lib/libc/gen
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 35b81cef1c0..5ebc0fa8e70 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/10/21 13:21:53 andvar Exp $
+# $NetBSD: Makefile,v 1.28 2023/06/03 09:09:11 lukem Exp $
WARNS= 3
@@ -29,8 +29,8 @@ FILESGRP_zlib.pc= ${BINGRP}
FILESMODE_zlib.pc= ${NONBINMODE}
FILESDIR_zlib.pc= /usr/lib/pkgconfig
-COPTS.infback.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
-COPTS.inflate.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
+COPTS.infback.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.inflate.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
.include <bsd.lib.mk>
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 1595c46b414..02d4d0d2bbf 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2020/06/15 01:57:31 christos Exp $
+# $NetBSD: Makefile,v 1.69 2023/06/03 09:09:11 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 4/4/94
.include <bsd.own.mk>
@@ -39,8 +39,8 @@ LDADD+= -lskey
.endif
.endif # USE_PAM == no
-COPTS.ftpd.c += ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.logwtmp.c += ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.ftpd.c += ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.logwtmp.c += ${CC_WNO_STRINGOP_TRUNCATION}
ftpd.o ftpcmd.o: version.h
@@ -55,7 +55,7 @@ ftpd.o ftpcmd.o: version.h
#
#.endif
-COPTS.ftpd.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.logwtmp.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.ftpd.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.logwtmp.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/libexec/lfs_cleanerd/Makefile.inc b/libexec/lfs_cleanerd/Makefile.inc
index 416f02d7178..e60b35db655 100644
--- a/libexec/lfs_cleanerd/Makefile.inc
+++ b/libexec/lfs_cleanerd/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2020/06/07 23:15:53 fox Exp $
+# $NetBSD: Makefile.inc,v 1.8 2023/06/03 09:09:11 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
WARNS?=3 # XXX: too many sign-compare issues
@@ -11,7 +11,7 @@ SRCS+= bufcache.c vnode.c lfs.c kernelops.c # segwrite.c
.PATH: ${NETBSDSRCDIR}/sys/ufs/lfs ${NETBSDSRCDIR}/sbin/fsck_lfs \
${NETBSDSRCDIR}/libexec/lfs_cleanerd
-COPTS.lfs_cleanerd.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.lfs_cleanerd.c+= ${CC_WNO_STRINGOP_TRUNCATION}
FSCK_LFS= ${NETBSDSRCDIR}/sbin/fsck_lfs
DPADD+= ${LIBUTIL}
diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile
index 7b0049b433b..1e50052c7fe 100644
--- a/libexec/rpc.rquotad/Makefile
+++ b/libexec/rpc.rquotad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/10/13 07:28:11 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 09:09:11 lukem Exp $
.include <bsd.own.mk>
PROG = rpc.rquotad
@@ -9,6 +9,6 @@ MLINKS = rpc.rquotad.8 rquotad.8
DPADD= ${LIBQUOTA} ${LIBRPCSVC}
LDADD= -lquota -lrpcsvc
-COPTS.rquotad.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rquotad.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile
index e0f1c6a15af..4bcee5fc30d 100644
--- a/libexec/rpc.rstatd/Makefile
+++ b/libexec/rpc.rstatd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/10/13 07:28:11 mrg Exp $
+# $NetBSD: Makefile,v 1.24 2023/06/03 09:09:11 lukem Exp $
.include <bsd.own.mk>
@@ -13,6 +13,6 @@ MLINKS= rpc.rstatd.8 rstatd.8
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
-COPTS.rstat_proc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rstat_proc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index dacd1a6c21b..2ea9f37806e 100644
--- a/libexec/rpc.rusersd/Makefile
+++ b/libexec/rpc.rusersd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/10/13 07:28:11 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2023/06/03 09:09:11 lukem Exp $
.include <bsd.own.mk>
@@ -15,6 +15,6 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
DPADD+= ${LIBRPCSVC}
LDADD+= -lrpcsvc
-COPTS.rusers_proc.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW} ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rusers_proc.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_STRINGOP_OVERFLOW} ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index 9e8e0889767..19bece6ea65 100644
--- a/libexec/rpc.rwalld/Makefile
+++ b/libexec/rpc.rwalld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:11 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2023/06/03 09:09:12 lukem Exp $
PROG = rpc.rwalld
SRCS = rwalld.c
@@ -8,6 +8,6 @@ MLINKS= rpc.rwalld.8 rwalld.8
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
-COPTS.rwalld.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rwalld.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile
index 753b1b57ba1..c28efa4de84 100644
--- a/libexec/rpc.sprayd/Makefile
+++ b/libexec/rpc.sprayd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:12 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 09:09:12 lukem Exp $
PROG = rpc.sprayd
SRCS = sprayd.c
@@ -8,6 +8,6 @@ MLINKS= rpc.sprayd.8 sprayd.8
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
-COPTS.sprayd.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.sprayd.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile
index 68b04f85c07..ec87b6f21fb 100644
--- a/sbin/disklabel/Makefile
+++ b/sbin/disklabel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2019/10/13 07:28:12 mrg Exp $
+# $NetBSD: Makefile,v 1.75 2023/06/03 09:09:12 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 3/17/94
PROG= disklabel
@@ -30,7 +30,7 @@ CPPFLAGS+= -DALPHA_BOOTBLOCK_CKSUM
CPPFLAGS+= -DVAX_ALTLABELS
.endif
-COPTS.main.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.interact.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.main.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.interact.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 897ccfbe255..24b0c00d36d 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2023/06/03 08:52:55 lukem Exp $
+# $NetBSD: Makefile,v 1.43 2023/06/03 09:09:12 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# dump.h header file
@@ -38,8 +38,8 @@ LDADD+= -lutil
.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs
COPTS.ffs_inode.c+= -Wno-pointer-sign
-COPTS.traverse.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.traverse.c+= ${CC_WNO_FORMAT_TRUNCATION}
CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
-CWARNFLAGS.gcc+= ${GCC_NO_FORMAT_TRUNCATION}
+CWARNFLAGS.gcc+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/sbin/dump_lfs/Makefile b/sbin/dump_lfs/Makefile
index 293b095b72a..7868cf7706e 100644
--- a/sbin/dump_lfs/Makefile
+++ b/sbin/dump_lfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/04/14 08:31:24 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2023/06/03 09:09:12 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# lfs_inode.c LFS filestore-specific routines
@@ -34,6 +34,6 @@ COPTS.lfs_inode.c+= -O3
.PATH: ${NETBSDSRCDIR}/sbin/dump ${NETBSDSRCDIR}/sys/ufs/lfs \
${NETBSDSRCDIR}/sys/ufs/ffs
-CWARNFLAGS.gcc+= ${GCC_NO_FORMAT_TRUNCATION}
+CWARNFLAGS.gcc+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index c68d3c26ea9..8de3420dd64 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/10/13 07:28:12 mrg Exp $
+# $NetBSD: Makefile,v 1.44 2023/06/03 09:09:12 lukem Exp $
PROG= fdisk
SRCS= fdisk.c
@@ -20,7 +20,7 @@ CPPFLAGS+= -D_PATH_DEFDISK='"/dev/rsd0d"'
CPPFLAGS+= -D_PATH_DEFDISK='"/dev/rwd0c"'
.endif
-COPTS.fdisk.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.fdisk.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 8fdac948cbe..7634eb025a2 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2019/10/13 07:28:12 mrg Exp $
+# $NetBSD: Makefile,v 1.41 2023/06/03 09:09:12 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 7/19/93
PROG= init
@@ -17,6 +17,6 @@ DPADD+= ${LIBCRYPT}
LDADD+= -lcrypt
.endif
-COPTS.init.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.init.c+= ${CC_WNO_FORMAT_TRUNCATION} ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/sbin/iscsictl/Makefile b/sbin/iscsictl/Makefile
index 1718c7c7230..6446b2af4bd 100644
--- a/sbin/iscsictl/Makefile
+++ b/sbin/iscsictl/Makefile
@@ -13,7 +13,7 @@ CPPFLAGS+= -I${.CURDIR}/../iscsid
MAN= iscsictl.8
-COPTS.iscsic_main.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.iscsic_driverif.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.iscsic_main.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.iscsic_driverif.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/sbin/pppoectl/Makefile b/sbin/pppoectl/Makefile
index 5da75465ec9..b022e0d6f6e 100644
--- a/sbin/pppoectl/Makefile
+++ b/sbin/pppoectl/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:12 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:13 lukem Exp $
PROG= pppoectl
MAN= pppoectl.8
USE_FORT?= yes # network client
-COPTS.pppoectl.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.pppoectl.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/sbin/raidctl/Makefile b/sbin/raidctl/Makefile
index 713d7e2e2ba..8d9ef3edc68 100644
--- a/sbin/raidctl/Makefile
+++ b/sbin/raidctl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/10/13 07:28:12 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2023/06/03 09:09:13 lukem Exp $
RUMPPRG=raidctl
SRCS= rf_configure.c raidctl.c
@@ -7,6 +7,6 @@ MAN= raidctl.8
DPADD= ${LIBUTIL}
LDADD= -lutil
-COPTS.raidctl.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.raidctl.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index f2617d87f40..d63009ab10c 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/10/13 07:28:13 mrg Exp $
+# $NetBSD: Makefile,v 1.28 2023/06/03 09:09:13 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -12,7 +12,7 @@ MAN= restore.8
MLINKS+=restore.8 rrestore.8
.PATH: ${NETBSDSRCDIR}/sbin/dump
-COPTS.interactive.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.dirs.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.interactive.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.dirs.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/sbin/rndctl/Makefile b/sbin/rndctl/Makefile
index ef4418daaf0..c984d3fcbb3 100644
--- a/sbin/rndctl/Makefile
+++ b/sbin/rndctl/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2020/01/14 23:13:36 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:13 lukem Exp $
.include <bsd.own.mk>
PROG= rndctl
MAN= rndctl.8
-COPTS.rndctl.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.rndctl.c+= ${CC_WNO_STRINGOP_TRUNCATION}
SRCS+= rndctl.c
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index 23831098225..d96f15fd448 100644
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/10/13 07:28:13 mrg Exp $
+# $NetBSD: Makefile,v 1.33 2023/06/03 09:09:13 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -29,6 +29,6 @@ DPADD+=${LIBUTIL}
# keywords.c keywords.h : keywords.sh
# ${HOST_SH} keywords.sh
-COPTS.rtutil.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.rtutil.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 3f30b0df203..c6b7ec131b9 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/10/13 07:28:13 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2023/06/03 09:09:13 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/19/93
USE_FORT?= yes # network client/server
@@ -17,7 +17,7 @@ MLINKS= routed.8 rdisc.8
COPTS.main.c = -Wno-format-nonliteral
COPTS.trace.c = -Wno-format-nonliteral
-COPTS.if.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.if.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile
index 32b407f119a..36a615abed5 100644
--- a/sbin/umount/Makefile
+++ b/sbin/umount/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/04/23 04:21:13 christos Exp $
+# $NetBSD: Makefile,v 1.21 2023/06/03 09:09:13 lukem Exp $
# @(#)Makefile 8.4 (Berkeley) 6/22/95
.include <bsd.own.mk>
@@ -18,6 +18,6 @@ SRCS+= vfslist.c
LDADD+=-lutil
DPADD+=${LIBUTIL}
-COPTS.umount.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.umount.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 844647de2f5..2e7f6a79030 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1336 2023/06/03 08:52:56 lukem Exp $
+# $NetBSD: bsd.own.mk,v 1.1337 2023/06/03 09:09:13 lukem Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -872,27 +872,31 @@ NOPROFILE= # defined
.endif
#
-# GCC_NO_*: Disable specific warnings from GCC.
-# Use these with e.g.
-# COPTS.foo.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+# Clang and GCC compiler-specific options, usually to disable warnings.
+# The naming convention is "CC" + the compiler flag converted
+# to upper case, with '-' and '=' changed to '_' a la `tr -=a-z __A-Z`.
+# For variable naming purposes, treat -Werror=FLAG as -WFLAG,
+# and -Wno-error=FLAG as -Wno-FLAG (usually from Clang).
#
-GCC_NO_FORMAT_TRUNCATION= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-format-truncation :}
-GCC_NO_FORMAT_OVERFLOW= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-format-overflow :}
-GCC_NO_STRINGOP_OVERFLOW= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-stringop-overflow :}
-GCC_NO_IMPLICIT_FALLTHRU= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-implicit-fallthrough :}
-GCC_NO_STRINGOP_TRUNCATION= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-stringop-truncation :}
-GCC_NO_CAST_FUNCTION_TYPE= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-cast-function-type :}
-GCC_NO_MAYBE_UNINITIALIZED= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-maybe-uninitialized :}
-GCC_NO_RETURN_LOCAL_ADDR= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-return-local-addr :}
-
+# E.g., CC_WNO_ADDRESS_OF_PACKED_MEMBER contains
+# both -Wno-error=address-of-packed-member for Clang,
+# and -Wno-address-of-packed-member for GCC 9+.
#
-# CC_NO_*: Disable specific compiler warnings from both Clang and GCC.
# Use these with e.g.
# COPTS.foo.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
#
CC_WNO_ADDRESS_OF_PACKED_MEMBER=${${ACTIVE_CC} == "clang" :? -Wno-error=address-of-packed-member :} \
${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-address-of-packed-member :}
+CC_WNO_CAST_FUNCTION_TYPE= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-cast-function-type :}
+CC_WNO_FORMAT_OVERFLOW= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-format-overflow :}
+CC_WNO_FORMAT_TRUNCATION= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-format-truncation :}
+CC_WNO_IMPLICIT_FALLTHROUGH= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-implicit-fallthrough :}
+CC_WNO_MAYBE_UNINITIALIZED= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-maybe-uninitialized :}
+CC_WNO_RETURN_LOCAL_ADDR= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-return-local-addr :}
+CC_WNO_STRINGOP_OVERFLOW= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-stringop-overflow :}
+CC_WNO_STRINGOP_TRUNCATION= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-stringop-truncation :}
+
#
# The ia64 port is incomplete.
#
diff --git a/sys/conf/copts.mk b/sys/conf/copts.mk
index 4035152afda..44b1f8f8340 100644
--- a/sys/conf/copts.mk
+++ b/sys/conf/copts.mk
@@ -1,4 +1,4 @@
-# $NetBSD: copts.mk,v 1.8 2023/06/03 08:52:58 lukem Exp $
+# $NetBSD: copts.mk,v 1.9 2023/06/03 09:09:13 lukem Exp $
# MI per-file compiler options required.
@@ -25,10 +25,10 @@ COPTS.ath.c+= -Wno-error=enum-conversion
COPTS.dpt.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.ffs_appleufs.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
# These are wrong. The code explicitly avoids this case.
-COPTS.in_pcb.c+= ${GCC_NO_RETURN_LOCAL_ADDR}
-COPTS.in6_pcb.c+= ${GCC_NO_RETURN_LOCAL_ADDR}
+COPTS.in_pcb.c+= ${CC_WNO_RETURN_LOCAL_ADDR}
+COPTS.in6_pcb.c+= ${CC_WNO_RETURN_LOCAL_ADDR}
# Also seems wrong.
-COPTS.magma.c+= ${GCC_NO_MAYBE_UNINITIALIZED}
+COPTS.magma.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
.endif
.endif
diff --git a/sys/modules/coredump/Makefile b/sys/modules/coredump/Makefile
index 17c06f298cf..68e18ce0275 100644
--- a/sys/modules/coredump/Makefile
+++ b/sys/modules/coredump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/11/01 18:51:03 pgoyette Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 09:09:14 lukem Exp $
.include "../Makefile.inc"
@@ -27,6 +27,6 @@ SRCS+= core_machdep.c
WARNS= 3
-COPTS.kern_core.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.kern_core.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.kmodule.mk>
diff --git a/sys/modules/drmkms_ttm/Makefile b/sys/modules/drmkms_ttm/Makefile
index ffef0873ccc..dcc8a1942d8 100644
--- a/sys/modules/drmkms_ttm/Makefile
+++ b/sys/modules/drmkms_ttm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/07/17 15:36:05 riastradh Exp $
+# $NetBSD: Makefile,v 1.2 2023/06/03 09:09:14 lukem Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -12,7 +12,7 @@ CPPFLAGS+= -DCONFIG_AGP=1
WARNS= 3
-COPTS.ttm_bo.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
+COPTS.ttm_bo.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
CWARNFLAGS+= -Wno-missing-field-initializers
CWARNFLAGS+= -Wno-shadow
diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile
index 817e1f984f8..b745f71a0e4 100644
--- a/sys/modules/dtrace/dtrace/Makefile
+++ b/sys/modules/dtrace/dtrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/10/13 22:30:52 christos Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 09:09:14 lukem Exp $
# $FreeBSD: src/sys/modules/dtrace/dtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
.include "../../Makefile.inc"
@@ -20,7 +20,7 @@ ARCH=${MACHINE_CPU}
.PATH: ${OSNETDIR}/dev/dtrace
.PATH: ${OSNETDIR}/dev/dtrace/${ARCH}
-COPTS.dtrace.c += ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.dtrace.c += ${CC_WNO_CAST_FUNCTION_TYPE}
KMOD= dtrace
SRCS= dtrace.c \
diff --git a/sys/modules/hpacel/Makefile b/sys/modules/hpacel/Makefile
index b898871083c..549e030170b 100644
--- a/sys/modules/hpacel/Makefile
+++ b/sys/modules/hpacel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/04/13 06:25:49 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 09:09:14 lukem Exp $
.include "../Makefile.inc"
@@ -8,6 +8,6 @@ KMOD= hpacel
IOCONF= hpacel.ioconf
SRCS= hpacel_acpi.c
-COPTS.hpacel_acpi.c+= ${GCC_NO_MAYBE_UNINITIALIZED}
+COPTS.hpacel_acpi.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
.include <bsd.kmodule.mk>
diff --git a/sys/modules/i915drmkms/Makefile b/sys/modules/i915drmkms/Makefile
index 5cceb8a477f..bba63f26ffe 100644
--- a/sys/modules/i915drmkms/Makefile
+++ b/sys/modules/i915drmkms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2022/07/17 14:11:40 riastradh Exp $
+# $NetBSD: Makefile,v 1.21 2023/06/03 09:09:14 lukem Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -60,12 +60,12 @@ COPTS.i915_pci.c+= ${${ACTIVE_CC} == "gcc":? -Wno-override-init :}
COPTS.i915_pci.c+= ${${ACTIVE_CC} == "clang":? -Wno-initializer-overrides :}
COPTS.i915_sw_fence.c+= ${${ACTIVE_CC} == "clang":? -Wno-unused-function :}
COPTS.intel_sprite.c+= ${${ACTIVE_CC} == "gcc":? -Wno-maybe-uninitialized :}
-COPTS.intel_ddi.c+= ${GCC_NO_MAYBE_UNINITIALIZED}
-COPTS.intel_ddi.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
-COPTS.intel_display.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
+COPTS.intel_ddi.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
+COPTS.intel_ddi.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.intel_display.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
COPTS.intel_guc_submission.c+= ${${ACTIVE_CC} == "clang":? -Wno-unused-function :}
COPTS.intel_hdmi.c+= ${${ACTIVE_CC} == "clang":? -Wno-unused-function :}
-COPTS.intel_sdvo.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
+COPTS.intel_sdvo.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
# NetBSD additions.
SRCS+= i915_module.c
diff --git a/sys/modules/lua/Makefile b/sys/modules/lua/Makefile
index 4c90b25e589..b37d4938cc6 100644
--- a/sys/modules/lua/Makefile
+++ b/sys/modules/lua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/04/16 20:46:18 nikita Exp $
+# $NetBSD: Makefile,v 1.14 2023/06/03 09:09:14 lukem Exp $
.include "../Makefile.inc"
@@ -24,6 +24,6 @@ CPPFLAGS+= -I${S}/../external/mit/lua/dist/src \
CWARNFLAGS.clang+= -Wno-error=string-plus-int
-COPTS.lstring.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.lstring.c+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.kmodule.mk>
diff --git a/sys/modules/ptrace_common/Makefile b/sys/modules/ptrace_common/Makefile
index 47646cdc0de..6952255e917 100644
--- a/sys/modules/ptrace_common/Makefile
+++ b/sys/modules/ptrace_common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/10/21 13:30:02 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:14 lukem Exp $
#
.include "../Makefile.inc"
@@ -11,6 +11,6 @@ SRCS= sys_ptrace_common.c
WARNS= 3
-COPTS.sys_ptrace_common.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.sys_ptrace_common.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.kmodule.mk>
diff --git a/sys/rump/fs/lib/libffs/Makefile b/sys/rump/fs/lib/libffs/Makefile
index 19c786576ae..dc62c6a73a2 100644
--- a/sys/rump/fs/lib/libffs/Makefile
+++ b/sys/rump/fs/lib/libffs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2023/06/03 08:52:59 lukem Exp $
+# $NetBSD: Makefile,v 1.23 2023/06/03 09:09:14 lukem Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/ffs ${.CURDIR}/../../../../ufs/ufs
@@ -17,7 +17,7 @@ SRCS+= ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \
CPPFLAGS+= -DFFS_EI -DUFS_DIRHASH -DWAPBL -DAPPLE_UFS -DUFS_EXTATTR \
-DQUOTA2 -DUFS_ACL
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER} ${GCC_NO_FORMAT_TRUNCATION}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER} ${CC_WNO_FORMAT_TRUNCATION}
CWARNFLAGS.gcc+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-error=restrict :}
.include <bsd.lib.mk>
diff --git a/sys/rump/librump/rumpkern/Makefile.rumpkern b/sys/rump/librump/rumpkern/Makefile.rumpkern
index ead5f886ba8..87de64c9287 100644
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.190 2023/04/22 13:54:59 riastradh Exp $
+# $NetBSD: Makefile.rumpkern,v 1.191 2023/06/03 09:09:15 lukem Exp $
#
IOCONFDIR:= ${.PARSEDIR}
@@ -243,11 +243,11 @@ SRCS+= atomic_cas_generic.c
#SRCS+= rump_atomic_cas_up.c
.endif
-COPTS.if_ethersubr.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.kern_hook.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.subr_vmem.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.subr_pool.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.rump.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.if_ethersubr.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.kern_hook.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.subr_vmem.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.subr_pool.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.rump.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
diff --git a/sys/rump/net/lib/libnet/Makefile b/sys/rump/net/lib/libnet/Makefile
index 3d49af764bb..bb1290d8091 100644
--- a/sys/rump/net/lib/libnet/Makefile
+++ b/sys/rump/net/lib/libnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2021/04/12 06:08:31 mrg Exp $
+# $NetBSD: Makefile,v 1.36 2023/06/03 09:09:15 lukem Exp $
#
@@ -27,10 +27,10 @@ SRCS+= rtsock_50.c uipc_syscalls_50.c
SRCS+= rtsock_70.c uipc_usrreq_70.c
.endif
-COPTS.if_ethersubr.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.if_ethersubr.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
# GCC is wrong here.
-COPTS.in_pcb.c+= ${GCC_NO_RETURN_LOCAL_ADDR}
-COPTS.in6_pcb.c+= ${GCC_NO_RETURN_LOCAL_ADDR}
+COPTS.in_pcb.c+= ${CC_WNO_RETURN_LOCAL_ADDR}
+COPTS.in6_pcb.c+= ${CC_WNO_RETURN_LOCAL_ADDR}
.include "${.CURDIR}/../libnetinet/Makefile.inc"
.include "${.CURDIR}/../libnetinet6/Makefile.inc"
diff --git a/tests/fs/common/Makefile b/tests/fs/common/Makefile
index efc11c7f6e4..109d6643d29 100644
--- a/tests/fs/common/Makefile
+++ b/tests/fs/common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/09/07 03:09:53 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 09:09:15 lukem Exp $
#
.include <bsd.own.mk>
@@ -40,11 +40,11 @@ CPPFLAGS+= -DMOUNT_NOMAIN -DMOUNTNFS_RETRYRPC=1
CPPFLAGS+= -DUSE_RUMP -DLFS_CLEANER_AS_LIB
CWARNFLAGS.clang+= -Wno-error=absolute-value
-COPTS.fstest_nfs.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.clnt_bcast.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.clnt_generic.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.clnt_vc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.rpcb_clnt.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.rpc_generic.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.fstest_nfs.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.clnt_bcast.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.clnt_generic.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.clnt_vc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_clnt.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.rpc_generic.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.lib.mk>
diff --git a/tests/fs/nfs/nfsservice/Makefile b/tests/fs/nfs/nfsservice/Makefile
index 97a8eb91b0b..9d614ebdcb0 100644
--- a/tests/fs/nfs/nfsservice/Makefile
+++ b/tests/fs/nfs/nfsservice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/03/07 15:09:12 christos Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 09:09:15 lukem Exp $
#
NOMAN= 1
@@ -50,10 +50,10 @@ DPADD+= ${LIBWRAP} ${LIBBLOCKLIST} ${LIBUTIL}
SANITIZER_RENAME_SYMBOL+= __getmntinfo13
-COPTS.pmap_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.rpcb_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.rpcb_svc_4.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.rpcb_svc_com.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.mountd.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.pmap_svc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc_4.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc_com.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.mountd.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.test.mk>
diff --git a/tests/lib/libarchive/Makefile b/tests/lib/libarchive/Makefile
index 7cb6df92c89..19e3da22a08 100644
--- a/tests/lib/libarchive/Makefile
+++ b/tests/lib/libarchive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/06/07 23:20:52 fox Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:15 lukem Exp $
NOMAN=
@@ -609,5 +609,5 @@ list.h: ${SRCS.h_libarchive} Makefile
${TOOL_GREP} -v _truncated_filter_ | \
${TOOL_GREP} -v test_compat_pax_libarchive_2x > ${.TARGET}
-COPTS.test_archive_string_conversion.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.test_archive_string_conversion.c+= ${CC_WNO_STRINGOP_TRUNCATION}
diff --git a/tests/lib/libc/rpc/Makefile b/tests/lib/libc/rpc/Makefile
index 32fcbd0f3aa..caf116d9088 100644
--- a/tests/lib/libc/rpc/Makefile
+++ b/tests/lib/libc/rpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:14 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 09:09:15 lukem Exp $
MKMAN= no
@@ -18,7 +18,7 @@ CPPFLAGS+= -I.
RPC_INCS= ${RPCSRCS:.x=.h}
RPC_XDRFILES= ${RPCSRCS:.x=_xdr.c}
-COPTS.t_rpc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.t_rpc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.rpc.mk>
.include <bsd.test.mk>
diff --git a/tests/lib/libc/ssp/Makefile b/tests/lib/libc/ssp/Makefile
index 4bbf91a5cae..faaa6f4f334 100644
--- a/tests/lib/libc/ssp/Makefile
+++ b/tests/lib/libc/ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/10/13 07:28:14 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 09:09:15 lukem Exp $
NOMAN= # defined
@@ -49,6 +49,6 @@ PROGS+= h_vsnprintf
PROGS+= h_vsprintf
# Test exercises truncation
-COPTS.h_snprintf.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.h_snprintf.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.test.mk>
diff --git a/tests/lib/libc/string/Makefile b/tests/lib/libc/string/Makefile
index 557511475a1..12ea5c1dfb0 100644
--- a/tests/lib/libc/string/Makefile
+++ b/tests/lib/libc/string/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2023/01/30 19:49:49 christos Exp $
+# $NetBSD: Makefile,v 1.14 2023/06/03 09:09:15 lukem Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libc/string
DBG=-g
-COPTS.t_strcat.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.t_strcat.c+= ${CC_WNO_STRINGOP_TRUNCATION}
TESTS_C+= t_bm
TESTS_C+= t_memchr
diff --git a/tests/lib/libevent/Makefile b/tests/lib/libevent/Makefile
index e7c1305efc2..be27a660af8 100644
--- a/tests/lib/libevent/Makefile
+++ b/tests/lib/libevent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/04/12 06:08:31 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 09:09:15 lukem Exp $
TESTSDIR= ${TESTSBASE}/lib/libevent
@@ -26,7 +26,7 @@ CPPFLAGS+= -DLIBEVENT_CRYPTO
DPADD+= ${LIBEVENT} ${LIBEVENT_PTHREADS} ${LIBZ} ${LIBPTHREAD}
LDADD+= -levent_pthreads -levent -lz -lpthread
-COPTS.regress_rpc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.regress_dns.c+= ${GCC_NO_MAYBE_UNINITIALIZED}
+COPTS.regress_rpc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.regress_dns.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
.include <bsd.test.mk>
diff --git a/tests/sys/netatalk/Makefile b/tests/sys/netatalk/Makefile
index f7e410b6672..013ffe53d20 100644
--- a/tests/sys/netatalk/Makefile
+++ b/tests/sys/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/04/12 02:54:08 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/03 09:09:16 lukem Exp $
#
WARNS?=6
@@ -9,6 +9,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/sys -D_TEST
TESTS_C= t_print
-COPTS.t_print.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.t_print.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.test.mk>
diff --git a/tools/compat/defs.mk.in b/tools/compat/defs.mk.in
index a5096d8eda0..808fd7dcafd 100644
--- a/tools/compat/defs.mk.in
+++ b/tools/compat/defs.mk.in
@@ -1,4 +1,4 @@
-# $NetBSD: defs.mk.in,v 1.15 2023/05/30 18:54:21 lukem Exp $
+# $NetBSD: defs.mk.in,v 1.16 2023/06/03 09:09:16 lukem Exp $
#
# Makefile fragment for building with libnbcompat and associated
# include files. It can also be used for building just with
@@ -75,10 +75,10 @@ HOST_CFLAGS+= @CC_NO_CPP_PRECOMP@
# Override HOST_CC support for <bsd.own.mk> CC_* warnings
#
-GCC_NO_FORMAT_TRUNCATION=@CC_WNO_FORMAT_TRUNCATION@
-GCC_NO_MAYBE_UNINITIALIZED=@CC_WNO_MAYBE_UNINITIALIZED@
-GCC_NO_STRINGOP_OVERFLOW=@CC_WNO_STRINGOP_OVERFLOW@
-GCC_NO_STRINGOP_TRUNCATION=@CC_WNO_STRINGOP_TRUNCATION@
+CC_WNO_FORMAT_TRUNCATION=@CC_WNO_FORMAT_TRUNCATION@
+CC_WNO_MAYBE_UNINITIALIZED=@CC_WNO_MAYBE_UNINITIALIZED@
+CC_WNO_STRINGOP_OVERFLOW=@CC_WNO_STRINGOP_OVERFLOW@
+CC_WNO_STRINGOP_TRUNCATION=@CC_WNO_STRINGOP_TRUNCATION@
HOST_CPPFLAGS+= ${COMPATINCFLAGS} -I${NETBSDSRCDIR}/tools/compat \
-DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64
diff --git a/usr.bin/btpin/Makefile b/usr.bin/btpin/Makefile
index ba14f9ac822..9db47869540 100644
--- a/usr.bin/btpin/Makefile
+++ b/usr.bin/btpin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:14 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 09:09:16 lukem Exp $
PROG= btpin
SRCS= btpin.c
@@ -7,6 +7,6 @@ MAN= btpin.1
DPADD+= ${LIBBLUETOOTH}
LDADD+= -lbluetooth
-COPTS.btpin.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.btpin.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/config/Makefile b/usr.bin/config/Makefile
index ea0bfa2d002..b908f5b6782 100644
--- a/usr.bin/config/Makefile
+++ b/usr.bin/config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/02/07 20:17:48 fox Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 09:09:16 lukem Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/19/94
.include <bsd.own.mk>
@@ -17,13 +17,13 @@ YHEADER=1
CPPFLAGS+=-I${.CURDIR} -I.
CPPFLAGS+= -I${NETBSDSRCDIR}/usr.bin/cksum
-COPTS.scan.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.scan.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.ifndef HOSTPROG
LDADD+=-lutil
DPADD+=${LIBUTIL}
-COPTS.mkheaders.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.sem.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.mkheaders.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.sem.c+= ${CC_WNO_FORMAT_TRUNCATION}
.endif
CWARNFLAGS+=-Wno-format-y2k
diff --git a/usr.bin/crunch/crunchgen/Makefile b/usr.bin/crunch/crunchgen/Makefile
index 866ab4fd0b9..f248ba72f8c 100644
--- a/usr.bin/crunch/crunchgen/Makefile
+++ b/usr.bin/crunch/crunchgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/10/13 07:28:15 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 09:09:16 lukem Exp $
PROG= crunchgen
SRCS= crunchgen.c crunched_skel.c
@@ -21,7 +21,7 @@ DPADD+=${LIBUTIL}
CPPFLAGS+= -DNEW_TOOLCHAIN
.endif
-COPTS.crunchgen.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.crunchgen.c+= ${CC_WNO_FORMAT_TRUNCATION}
.else
diff --git a/usr.bin/cvslatest/Makefile b/usr.bin/cvslatest/Makefile
index 6a808675b71..63d01b4216f 100644
--- a/usr.bin/cvslatest/Makefile
+++ b/usr.bin/cvslatest/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2019/10/13 07:28:15 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/03 09:09:16 lukem Exp $
WARNS=6
PROG= cvslatest
-COPTS.cvslatest.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.cvslatest.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index 74b3029e3ec..8dec4d73f9a 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2022/06/19 11:31:19 simonb Exp $
+# $NetBSD: Makefile,v 1.28 2023/06/03 09:09:16 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -29,6 +29,6 @@ DPADD+=${LIBUTIL}
.include "../../compat/exec.mk"
-COPTS.fstat.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.fstat.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index 66402bed82b..4aa2c9ab56b 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2021/06/03 10:23:33 lukem Exp $
+# $NetBSD: Makefile,v 1.40 2023/06/03 09:09:16 lukem Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/3/94
.include <bsd.own.mk>
@@ -31,6 +31,6 @@ CPPFLAGS+= -DINET6
cmds.o fetch.o: version.h
main.o: ftp_var.h
-CWARNFLAGS.gcc+= ${GCC_NO_FORMAT_OVERFLOW}
+CWARNFLAGS.gcc+= ${CC_WNO_FORMAT_OVERFLOW}
.include <bsd.prog.mk>
diff --git a/usr.bin/hexdump/Makefile b/usr.bin/hexdump/Makefile
index def9d8a9bf7..f4f4c96f21f 100644
--- a/usr.bin/hexdump/Makefile
+++ b/usr.bin/hexdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:15 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2023/06/03 09:09:17 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= hexdump
@@ -15,6 +15,6 @@ LINKS= ${BINDIR}/hexdump ${BINDIR}/od
COPTS.conv.c += -Wno-format-nonliteral
COPTS.display.c += -Wno-format-nonliteral
-COPTS.parse.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.parse.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index b671c0efb67..72459a39dc2 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2019/10/13 07:28:15 mrg Exp $
+# $NetBSD: Makefile,v 1.59 2023/06/03 09:09:17 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 7/19/93
.include <bsd.own.mk>
@@ -45,7 +45,7 @@ copyrightstr.c: ${NETBSDSRCDIR}/sys/conf/copyright
END { print "\"\\n\";" }\
' ${.ALLSRC} > ${.TARGET}
-COPTS.parse.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.common.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.parse.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.common.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index 68120c32c9a..c5b2fda5197 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2022/08/30 13:40:37 riastradh Exp $
+# $NetBSD: Makefile,v 1.42 2023/06/03 09:09:17 lukem Exp $
# @(#)Makefile 8.3 (Berkeley) 4/20/95
.include <bsd.own.mk>
@@ -78,7 +78,7 @@ FILESDIR_mail.rc= /etc
FILESMODE_mail.rc= 644
COPTS.format.c+= -Wno-format-nonliteral
-COPTS.fio.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.fio.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 671426924b9..8c6e13a99b1 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2022/09/27 17:46:58 rillig Exp $
+# $NetBSD: Makefile,v 1.124 2023/06/03 09:09:17 lukem Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -88,11 +88,11 @@ LINTFLAGS+= -T # strict bool mode, available since 2021-01-11
LINTFLAGS+= -w # treat warnings as errors
CLEANFILES+= *.o # for filemon objects
-COPTS.arch.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.dir.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.arch.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.dir.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.job.c+= -Wno-format-nonliteral # custom shell templates
-COPTS.main.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.meta.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.main.c+= ${CC_WNO_FORMAT_TRUNCATION} ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.meta.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.var.c+= -Wno-format-nonliteral # strftime
CPPFLAGS+= -DMAKE_NATIVE
diff --git a/usr.bin/man/Makefile b/usr.bin/man/Makefile
index 9dba3f24afa..7023fac8ec4 100644
--- a/usr.bin/man/Makefile
+++ b/usr.bin/man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/10/13 07:28:15 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 09:09:17 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
WARNS?= 6
@@ -10,6 +10,6 @@ MAN= man.1 man.conf.5
DPADD+= ${LIBUTIL}
LDADD+= -lutil
-COPTS.man.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.man.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index eed1fa01175..98e4d5de373 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/10/13 07:28:15 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2023/06/03 09:09:17 lukem Exp $
WARNS?= 2 # XXX -Wextra -Wsign-compare issues
@@ -22,5 +22,5 @@ YHEADER= 1
.ifndef HOSTPROG
.include <bsd.prog.mk>
-COPTS.man.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.man.c+= ${CC_WNO_FORMAT_TRUNCATION}
.endif
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index cd4d97c8537..e1e6407e0db 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:16 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2023/06/03 09:09:17 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 4/28/95
PROG= msgs
DPADD= ${LIBTERMINFO}
LDADD= -lterminfo
-COPTS.msgs.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.msgs.c+= ${CC_WNO_FORMAT_TRUNCATION} ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index 4701d94ce1b..98e01b8fe1b 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2020/04/03 16:41:59 christos Exp $
+# $NetBSD: Makefile,v 1.49 2023/06/03 09:09:17 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -41,8 +41,8 @@ CPPFLAGS+= -DINET6
.include "../../compat/exec.mk"
-COPTS.atalk.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.inet6.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.rtutil.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.atalk.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.inet6.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.rtutil.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/quota/Makefile b/usr.bin/quota/Makefile
index 0667adc12ef..ad682bb4a4b 100644
--- a/usr.bin/quota/Makefile
+++ b/usr.bin/quota/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/10/13 07:28:16 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/03 09:09:17 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -9,6 +9,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/usr.bin/quota
DPADD= ${LIBQUOTA} ${LIBRPCSVC}
LDADD= -lquota -lrpcsvc
-COPTS.printquota.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.printquota.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/rdist/Makefile b/usr.bin/rdist/Makefile
index 4b2228a0544..d9fe24973ee 100644
--- a/usr.bin/rdist/Makefile
+++ b/usr.bin/rdist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/10/13 07:28:16 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/03 09:09:18 lukem Exp $
# from: @(#)Makefile 8.3 (Berkeley) 7/19/93
USE_FORT?= yes # network client/server
@@ -9,6 +9,6 @@ SRCS= docmd.c expand.c gram.y lookup.c main.c server.c
.include <bsd.own.mk>
-COPTS.server.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.server.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile
index bda9fde0da8..63c6c404574 100644
--- a/usr.bin/rpcgen/Makefile
+++ b/usr.bin/rpcgen/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2019/10/13 07:28:16 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/03 09:09:18 lukem Exp $
PROG= rpcgen
SRCS= rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c rpc_parse.c rpc_scan.c \
rpc_svcout.c rpc_util.c rpc_sample.c rpc_tblout.c
-COPTS.rpc_cout.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.rpc_cout.c+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.prog.mk>
diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile
index 3f49bd33260..291e628509f 100644
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/10/13 07:28:16 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 09:09:18 lukem Exp $
# from: @(#)Makefile 5.2 (Berkeley) 5/11/90
.include <bsd.own.mk>
@@ -17,6 +17,6 @@ CPPFLAGS+= -DINET6
.PATH: ${LIBCRPCDIR}
-COPTS.rpcinfo.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpcinfo.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index be8ea03330d..4503c453e6e 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/10/13 07:28:16 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 09:09:18 lukem Exp $
USE_FORT?= yes # network client
@@ -7,6 +7,6 @@ PROG= rup
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
-COPTS.rup.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rup.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index 5d87073a115..699524d0385 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:16 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 09:09:18 lukem Exp $
USE_FORT?= yes # network client
@@ -7,6 +7,6 @@ PROG = rusers
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
-COPTS.rusers.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rusers.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index 0eb0ffe9e8c..14dd4275d89 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:16 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2023/06/03 09:09:18 lukem Exp $
USE_FORT?= yes # network client
@@ -7,6 +7,6 @@ PROG = rwall
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
-COPTS.rwall.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rwall.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.bin/showmount/Makefile b/usr.bin/showmount/Makefile
index 914478b6097..1664094dc00 100644
--- a/usr.bin/showmount/Makefile
+++ b/usr.bin/showmount/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:17 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 09:09:18 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
USE_FORT?= yes # network client
@@ -6,6 +6,6 @@ USE_FORT?= yes # network client
PROG= showmount
MAN= showmount.8
-COPTS.showmount.c+= ${GCC_NO_STRINGOP_OVERFLOW} ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.showmount.c+= ${CC_WNO_STRINGOP_OVERFLOW} ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile
index 505bcfbe160..d7d86773bce 100644
--- a/usr.bin/sort/Makefile
+++ b/usr.bin/sort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/10/13 07:28:17 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 09:09:18 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= sort
@@ -8,6 +8,6 @@ SRCS+= radix_sort.c
LDADD+=-lutil
DPADD+=${LIBUTIL}
-COPTS.init.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.init.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index f9f2ea359b1..e2afb223752 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2020/12/11 07:24:38 simonb Exp $
+# $NetBSD: Makefile,v 1.45 2023/06/03 09:09:18 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -29,8 +29,8 @@ SRCS+= ip6.c
.include "../../compat/exec.mk"
-COPTS.df.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.ifstat.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.ps.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.df.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.ifstat.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.ps.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index b390be46484..4ccb0f1b19d 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/02/08 12:53:29 fox Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 09:09:19 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
USE_FORT?= yes # network client
@@ -9,6 +9,6 @@ LDADD= -lcurses -lterminfo -lutil
SRCS= ctl.c ctl_transact.c display.c get_addrs.c get_names.c \
init_disp.c invite.c io.c look_up.c msgs.c talk.c
-COPTS.get_names.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.get_names.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index c36737e86cf..2d0b1369843 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2019/10/13 07:28:17 mrg Exp $
+# $NetBSD: Makefile,v 1.60 2023/06/03 09:09:19 lukem Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@@ -82,6 +82,6 @@ COPTS.${f}.c+= -Wno-pointer-sign
COPTS.telnet.c+= -Wno-error=implicit-fallthrough
.endif
-COPTS.sys_bsd.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.sys_bsd.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile
index 2af169fde0c..990bf8b097d 100644
--- a/usr.bin/tftp/Makefile
+++ b/usr.bin/tftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/02/03 06:51:26 roy Exp $
+# $NetBSD: Makefile,v 1.16 2023/06/03 09:09:19 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
WARNS?=2
@@ -8,7 +8,7 @@ USE_FORT?= yes # network client
PROG= tftp
SRCS= main.c tftp.c tftpsubs.c
-CWARNFLAGS.gcc+= ${GCC_NO_STRINGOP_OVERFLOW} \
+CWARNFLAGS.gcc+= ${CC_WNO_STRINGOP_OVERFLOW} \
${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-array-bounds :}
.include <bsd.prog.mk>
diff --git a/usr.bin/unifdef/Makefile b/usr.bin/unifdef/Makefile
index 0bc2ebfc078..8d2f8cba80b 100644
--- a/usr.bin/unifdef/Makefile
+++ b/usr.bin/unifdef/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:17 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 09:09:19 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= unifdef
@@ -7,6 +7,6 @@ SCRIPTS=unifdefall.sh
MLINKS= unifdef.1 unifdefall.1
-COPTS.unifdef.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.unifdef.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/utoppya/Makefile b/usr.bin/utoppya/Makefile
index b3fc6d7fc82..fab4a091b42 100644
--- a/usr.bin/utoppya/Makefile
+++ b/usr.bin/utoppya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:17 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/03 09:09:19 lukem Exp $
.include <bsd.own.mk>
@@ -9,6 +9,6 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ftp -DSTANDALONE_PROGRESS
.PATH: ${NETBSDSRCDIR}/usr.bin/ftp
-COPTS.utoppya.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.utoppya.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile
index 0ad4eb77533..27da59dabe5 100644
--- a/usr.bin/w/Makefile
+++ b/usr.bin/w/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/07/01 06:31:18 martin Exp $
+# $NetBSD: Makefile,v 1.23 2023/06/03 09:09:19 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -14,6 +14,6 @@ CPPFLAGS+= -DSUPPORT_UTMP -DSUPPORT_UTMPX
.PATH: ${NETBSDSRCDIR}/bin/ps
COPTS.pr_time.c += -Wno-format-y2k
-COPTS.w.c += ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.w.c += ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/wall/Makefile b/usr.bin/wall/Makefile
index 5be64d6f8ab..200c8ff0147 100644
--- a/usr.bin/wall/Makefile
+++ b/usr.bin/wall/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:17 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 09:09:19 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -16,6 +16,6 @@ LDADD+=-lutil
CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/write
-COPTS.wall.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.wall.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index 297f6eac59c..e56c1bde2cf 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2020/10/30 20:05:00 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2023/06/03 09:09:19 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -20,6 +20,6 @@ COPTS.xinstall.c += -Wno-format-nonliteral
PROGNAME=install
-CWARNFLAGS.gcc+= ${GCC_NO_FORMAT_TRUNCATION}
+CWARNFLAGS.gcc+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/acpitools/amldb/Makefile b/usr.sbin/acpitools/amldb/Makefile
index d0acbac27fa..bf8c00c991c 100644
--- a/usr.sbin/acpitools/amldb/Makefile
+++ b/usr.sbin/acpitools/amldb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/09/12 15:25:42 jmcneill Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 09:09:20 lukem Exp $
# Id: Makefile,v 1.5 2000/07/14 18:16:30 iwasaki Exp
# $FreeBSD: src/usr.sbin/acpi/amldb/Makefile,v 1.7 2001/10/22 17:25:32 iwasaki Exp $
@@ -15,7 +15,7 @@ CPPFLAGS+= -I${.CURDIR} -D_KERNTYPES
MAN= amldb.8
-COPTS.aml_name.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.aml_name.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
.PATH: ${.CURDIR}/../aml
diff --git a/usr.sbin/altq/altqstat/Makefile b/usr.sbin/altq/altqstat/Makefile
index 5dcbc6ad4df..207218dcfca 100644
--- a/usr.sbin/altq/altqstat/Makefile
+++ b/usr.sbin/altq/altqstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/02/08 01:01:31 fox Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:20 lukem Exp $
PROG= altqstat
SRCS= altqstat.c quip_client.c qdisc_conf.c qdisc_cbq.c qdisc_hfsc.c \
@@ -10,6 +10,6 @@ CPPFLAGS+= -DALTQ -I${.CURDIR}/../libaltq
DPADD+= ${LIBCURSES} ${LIBTERMINFO} ${LIBMATH}
LDADD+= -lcurses -lterminfo -lm
-COPTS.quip_client.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.quip_client.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/altq/libaltq/Makefile b/usr.sbin/altq/libaltq/Makefile
index 9f34a13ccaf..958891ac14c 100644
--- a/usr.sbin/altq/libaltq/Makefile
+++ b/usr.sbin/altq/libaltq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/10/13 07:28:17 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2023/06/03 09:09:20 lukem Exp $
LIBISPRIVATE= yes
@@ -15,6 +15,6 @@ CPPFLAGS+= -DALTQ
CPPFLAGS+= -DINET6
.endif
-COPTS+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.lib.mk>
diff --git a/usr.sbin/altq/tbrconfig/Makefile b/usr.sbin/altq/tbrconfig/Makefile
index 00b28b74728..c155e6ee851 100644
--- a/usr.sbin/altq/tbrconfig/Makefile
+++ b/usr.sbin/altq/tbrconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:17 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:20 lukem Exp $
.include <bsd.own.mk> # for MKDYNAMICROOT definition
@@ -12,6 +12,6 @@ LDSTATIC?=-static
CPPFLAGS+= -DALTQ -I${.CURDIR}/../libaltq
-COPTS.tbrconfig.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.tbrconfig.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index 53d587b9ff2..eb95c776708 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/10/13 07:28:18 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2023/06/03 09:09:20 lukem Exp $
.include <bsd.own.mk>
@@ -18,6 +18,6 @@ LINKS= ${BINDIR}/apm ${BINDIR}/zzz
MAN= apm.8
MLINKS= apm.8 zzz.8
-COPTS.apm.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.apm.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index e15935d3736..857f7c2212f 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/10/13 07:28:18 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2023/06/03 09:09:20 lukem Exp $
.include <bsd.own.mk>
@@ -17,6 +17,6 @@ MAN= apmd.8
LDADD+= -lutil
DPADD+= ${LIBUTIL}
-COPTS.apmd.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.apmd.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/btpand/Makefile b/usr.sbin/btpand/Makefile
index 8eb8d49b55e..51fd6b6e2de 100644
--- a/usr.sbin/btpand/Makefile
+++ b/usr.sbin/btpand/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:18 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 09:09:20 lukem Exp $
#
PROG= btpand
@@ -8,6 +8,6 @@ SRCS= btpand.c bnep.c channel.c client.c packet.c server.c tap.c
DPADD+= ${LIBBLUETOOTH} ${LIBEVENT} ${LIBUTIL}
LDADD+= -lbluetooth -levent -lutil
-COPTS.tap.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.tap.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/catman/Makefile b/usr.sbin/catman/Makefile
index 6d1dc0844ba..981c69f7565 100644
--- a/usr.sbin/catman/Makefile
+++ b/usr.sbin/catman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/10/13 07:28:18 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 09:09:20 lukem Exp $
.include <bsd.own.mk>
@@ -9,6 +9,6 @@ MAN= catman.8
.PATH: ${NETBSDSRCDIR}/usr.bin/man
CPPFLAGS+= -I${NETBSDSRCDIR}/usr.bin/man
-COPTS.catman.c+= -Wno-format-nonliteral ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.catman.c+= -Wno-format-nonliteral ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/cnwctl/Makefile b/usr.sbin/cnwctl/Makefile
index f085355e50b..cc5caf0a318 100644
--- a/usr.sbin/cnwctl/Makefile
+++ b/usr.sbin/cnwctl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:18 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 09:09:20 lukem Exp $
# PAO2 Id: Makefile,v 1.1.1.1 1997/12/11 14:46:06 itojun Exp
PROG= cnwctl
MAN= cnwctl.8
-COPTS.cnwctl.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.cnwctl.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/crash/Makefile b/usr.sbin/crash/Makefile
index a3bdcef5614..11540e788fc 100644
--- a/usr.sbin/crash/Makefile
+++ b/usr.sbin/crash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2023/04/12 17:53:32 riastradh Exp $
+# $NetBSD: Makefile,v 1.48 2023/06/03 09:09:21 lukem Exp $
PROG= crash
MAN= crash.8
@@ -127,7 +127,7 @@ COPTS.kern_timeout.c += -Wno-stack-protector
.include "../../compat/exec.mk"
-COPTS.db_command.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.db_command.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
COPTS+= -fcommon
diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile
index 66e0747a136..7e6bef0f7a8 100644
--- a/usr.sbin/edquota/Makefile
+++ b/usr.sbin/edquota/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:18 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 09:09:21 lukem Exp $
.include <bsd.own.mk>
@@ -15,6 +15,6 @@ LDADD= -lquota -lrpcsvc
.PATH: ${NETBSDSRCDIR}/usr.bin/quota
SRCS+= printquota.c
-COPTS.printquota.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.printquota.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/ifwatchd/Makefile b/usr.sbin/ifwatchd/Makefile
index 9327b1339fe..33249893bcb 100644
--- a/usr.sbin/ifwatchd/Makefile
+++ b/usr.sbin/ifwatchd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:18 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/03 09:09:21 lukem Exp $
PROG=ifwatchd
MAN=ifwatchd.8
-COPTS.ifwatchd.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.ifwatchd.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/ipwctl/Makefile b/usr.sbin/ipwctl/Makefile
index 22f8228ccd5..cfac085e70c 100644
--- a/usr.sbin/ipwctl/Makefile
+++ b/usr.sbin/ipwctl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:19 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 09:09:21 lukem Exp $
.if ${MACHINE_ARCH} == "i386"
PROG= ipwctl
@@ -6,6 +6,6 @@ PROG= ipwctl
MAN= ipwctl.8
-COPTS.ipwctl.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.ipwctl.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/iwictl/Makefile b/usr.sbin/iwictl/Makefile
index 000a70a2cca..5082a6c0283 100644
--- a/usr.sbin/iwictl/Makefile
+++ b/usr.sbin/iwictl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:19 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 09:09:21 lukem Exp $
PROG = iwictl
MAN = iwictl.8
-COPTS.iwictl.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.iwictl.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile
index 6da00e8d7e5..4a7e80bad88 100644
--- a/usr.sbin/makefs/Makefile
+++ b/usr.sbin/makefs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2023/01/07 19:41:30 chs Exp $
+# $NetBSD: Makefile,v 1.41 2023/06/03 09:09:21 lukem Exp $
#
.include <bsd.own.mk>
@@ -32,11 +32,11 @@ LDADD+= -lm
DPADD+= ${LIBUTIL} ${LIBM}
LDADD+= -lutil -lm
-COPTS.cd9660.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.cd9660_conversion.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.udf.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.v7fs_estimate.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.v7fs_populate.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.cd9660.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.cd9660_conversion.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.udf.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.v7fs_estimate.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.v7fs_populate.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_FORMAT_TRUNCATION}
.endif
.include <bsd.prog.mk>
diff --git a/usr.sbin/mopd/common/Makefile b/usr.sbin/mopd/common/Makefile
index 03c9706c1ae..2e414d86fdc 100644
--- a/usr.sbin/mopd/common/Makefile
+++ b/usr.sbin/mopd/common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/10/31 18:06:42 christos Exp $
+# $NetBSD: Makefile,v 1.24 2023/06/03 09:09:21 lukem Exp $
LIBISPRIVATE= yes
@@ -16,6 +16,6 @@ version.c: VERSION
COPTS.print.c+= -Wno-pointer-sign
-COPTS.pf.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.pf.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.lib.mk>
diff --git a/usr.sbin/mopd/mopd/Makefile b/usr.sbin/mopd/mopd/Makefile
index 9efa31c24fb..69e179433ae 100644
--- a/usr.sbin/mopd/mopd/Makefile
+++ b/usr.sbin/mopd/mopd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/10/31 18:06:42 christos Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/03 09:09:21 lukem Exp $
.include <bsd.init.mk>
@@ -9,7 +9,7 @@ MAN= mopd.8
LDADD+= -lutil
DPADD+= ${LIBUTIL}
-COPTS.process.c+= -Wno-pointer-sign ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.process.c+= -Wno-pointer-sign ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile
index f285190a472..2bdc51fd733 100644
--- a/usr.sbin/mountd/Makefile
+++ b/usr.sbin/mountd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/10/13 07:28:19 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2023/06/03 09:09:22 lukem Exp $
# @(#)Makefile 8.3 (Berkeley) 1/25/94
USE_FORT?= yes # network server
@@ -15,6 +15,6 @@ DPADD+= ${LIBIPSEC} ${LIBUTIL}
.include <bsd.prog.mk>
-COPTS.mountd.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.mountd.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.PATH: ${INETDDIR}
diff --git a/usr.sbin/mrouted/Makefile b/usr.sbin/mrouted/Makefile
index 5b9276730f9..1a4192e29ae 100644
--- a/usr.sbin/mrouted/Makefile
+++ b/usr.sbin/mrouted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/06/03 08:53:00 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2023/06/03 09:09:22 lukem Exp $
# from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp
.include <bsd.own.mk>
@@ -17,7 +17,7 @@ CPPFLAGS+= -I${.CURDIR}
CWARNFLAGS.clang+= -Wno-format-extra-args
CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
-COPTS.cfparse.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.vif.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.cfparse.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.vif.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/perfused/Makefile b/usr.sbin/perfused/Makefile
index 9858c647128..3df00939d08 100644
--- a/usr.sbin/perfused/Makefile
+++ b/usr.sbin/perfused/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:19 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 09:09:22 lukem Exp $
PROG= perfused
@@ -14,6 +14,6 @@ LDADD+= -lperfuse -lpuffs
DPADD+= ${LIBPUFFS}
CWARNFLAGS.clang+= -Wno-format-security
-COPTS.perfused.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.perfused.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/pf/pfctl/Makefile b/usr.sbin/pf/pfctl/Makefile
index ac63684ea77..0ebc74427b0 100644
--- a/usr.sbin/pf/pfctl/Makefile
+++ b/usr.sbin/pf/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/04/12 02:54:08 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:22 lukem Exp $
# $OpenBSD: Makefile,v 1.17 2004/07/16 23:44:24 frantzen Exp $
.include <bsd.own.mk> # for MKDYNAMICROOT definition
@@ -25,6 +25,6 @@ LDSTATIC?= -static
.include <bsd.prog.mk>
-COPTS.pfctl_osfp.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.pfctl_osfp.c+= ${CC_WNO_FORMAT_TRUNCATION}
.PATH: ${NETBSDSRCDIR}/dist/pf/sbin/pfctl
diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile
index dc2b04dfcdb..3b05a22bd24 100644
--- a/usr.sbin/rarpd/Makefile
+++ b/usr.sbin/rarpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:19 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2023/06/03 09:09:22 lukem Exp $
USE_FORT?= yes # network server
@@ -16,6 +16,6 @@ DPADD+= ${LIBUTIL}
.include <bsd.prog.mk>
-COPTS.rarpd.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.rarpd.c+= ${CC_WNO_STRINGOP_TRUNCATION}
COPTS.mkarp.c+= -Wno-pointer-sign
diff --git a/usr.sbin/rbootd/Makefile b/usr.sbin/rbootd/Makefile
index 852c0ce7826..bc2c40c5319 100644
--- a/usr.sbin/rbootd/Makefile
+++ b/usr.sbin/rbootd/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $NetBSD: Makefile,v 1.16 2022/09/03 07:45:08 tsutsui Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 09:09:22 lukem Exp $
WARNS?= 5
USE_FORT?= yes # network server
@@ -17,6 +17,6 @@ DPADD+= ${LIBUTIL}
COPTS.utils.c+= -fno-strict-aliasing
.endif
-COPTS.bpf.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.bpf.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile
index 3b1c2f5493a..9d9f934cafd 100644
--- a/usr.sbin/repquota/Makefile
+++ b/usr.sbin/repquota/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:20 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2023/06/03 09:09:22 lukem Exp $
WARNS ?= 4
.include <bsd.own.mk>
@@ -17,6 +17,6 @@ LDADD= -lquota -lrpcsvc
.PATH: ${NETBSDSRCDIR}/usr.bin/quota
SRCS+= printquota.c
-COPTS.printquota.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.printquota.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
index 5f97403738a..eb7fb697bb3 100644
--- a/usr.sbin/route6d/Makefile
+++ b/usr.sbin/route6d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:20 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 09:09:22 lukem Exp $
USE_FORT?= yes # network server
@@ -10,6 +10,6 @@ CPPFLAGS+=-DINET6
LDADD+= -lutil
DPADD+= ${LIBUTIL}
-COPTS.route6d.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.route6d.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/rpc.bootparamd/Makefile b/usr.sbin/rpc.bootparamd/Makefile
index d84ebf7ae5a..37b0730384b 100644
--- a/usr.sbin/rpc.bootparamd/Makefile
+++ b/usr.sbin/rpc.bootparamd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/10/13 07:28:20 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2023/06/03 09:09:22 lukem Exp $
.include <bsd.own.mk>
@@ -22,7 +22,7 @@ RPC_XDIR= ${DESTDIR}/usr/include/rpcsvc/
CPPFLAGS+= -I${RPC_XDIR}
-COPTS.bootparam_prot_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.bootparam_prot_svc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.rpc.mk>
.include <bsd.prog.mk>
diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile
index 74f07810ce8..b97645c9b49 100644
--- a/usr.sbin/rpc.lockd/Makefile
+++ b/usr.sbin/rpc.lockd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/10/13 07:28:20 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2023/06/03 09:09:23 lukem Exp $
USE_FORT?= yes # network server
@@ -23,8 +23,8 @@ CLEANFILES= test
test: ${.CURDIR}/test.c
cc -o test ${.CURDIR}/test.c -lrpcsvc
-COPTS.lockd_lock.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.lock_proc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.nlm_prot_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.lockd_lock.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.lock_proc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.nlm_prot_svc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.sbin/rpc.pcnfsd/Makefile b/usr.sbin/rpc.pcnfsd/Makefile
index 87d4372a5ac..e2f3dff843d 100644
--- a/usr.sbin/rpc.pcnfsd/Makefile
+++ b/usr.sbin/rpc.pcnfsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/10/13 07:28:20 mrg Exp $
+# $NetBSD: Makefile,v 1.25 2023/06/03 09:09:23 lukem Exp $
.include <bsd.own.mk>
@@ -31,8 +31,8 @@ COPTS.pcnfsd_v2.c+= -Wno-pointer-sign
CLEANFILES += clnt.pcnfsd pcnfsd_test.o pcnfsd_test.ln pcnfsd_clnt.*
-COPTS.pcnfsd_misc.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.pcnfsd_print.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.pcnfsd_svc.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.pcnfsd_misc.c+= ${CC_WNO_FORMAT_TRUNCATION} ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.pcnfsd_print.c+= ${CC_WNO_FORMAT_TRUNCATION} ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.pcnfsd_svc.c+= ${CC_WNO_FORMAT_TRUNCATION} ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile
index 4e3834d3aae..ccf2cf4691a 100644
--- a/usr.sbin/rpc.statd/Makefile
+++ b/usr.sbin/rpc.statd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:20 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 09:09:23 lukem Exp $
PROG= rpc.statd
SRCS= sm_inter_svc.c statd.c stat_proc.c
@@ -16,10 +16,10 @@ RPC_SVCFILES= sm_inter_svc.c
RPC_SVCFLAGS= -L -m
RPC_XDIR= ${DESTDIR}/usr/include/rpcsvc/
-COPTS.sm_inter_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE} ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.statd.c+= ${GCC_NO_CAST_FUNCTION_TYPE} ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.stat_proc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.rpcb_svc_4.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.sm_inter_svc.c+= ${CC_WNO_CAST_FUNCTION_TYPE} ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.statd.c+= ${CC_WNO_CAST_FUNCTION_TYPE} ${CC_WNO_FORMAT_TRUNCATION} ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.stat_proc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc_4.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.rpc.mk>
.include <bsd.prog.mk>
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index ca581a3e334..563b9f09e27 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:20 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 09:09:23 lukem Exp $
PROG= rpc.yppasswdd
SRCS= rpc.yppasswdd.c yppasswdd_mkpw.c
@@ -8,6 +8,6 @@ MLINKS= rpc.yppasswdd.8 yppasswdd.8
DPADD+= ${LIBRPCSVC} ${LIBCRYPT} ${LIBUTIL}
LDADD+= -lrpcsvc -lcrypt -lutil
-COPTS.rpc.yppasswdd.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpc.yppasswdd.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile
index eb7929d392f..1158ea707ca 100644
--- a/usr.sbin/rpcbind/Makefile
+++ b/usr.sbin/rpcbind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/03/07 00:23:06 christos Exp $
+# $NetBSD: Makefile,v 1.18 2023/06/03 09:09:23 lukem Exp $
.include <bsd.own.mk>
@@ -30,10 +30,10 @@ CPPFLAGS+= -DYP
LDADD+= -lwrap -lblocklist -lutil
DPADD+= ${LIBWRAP} ${LIBBLOCKLIST} ${LIBUTIL}
-COPTS.rpcb_svc_4.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.pmap_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.rpcb_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.rpcb_svc_com.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc_4.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.pmap_svc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc_com.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.PATH: ${LIBCRPCDIR}
diff --git a/usr.sbin/rtadvd/Makefile b/usr.sbin/rtadvd/Makefile
index 6b9fe806534..957d4f7f3e5 100644
--- a/usr.sbin/rtadvd/Makefile
+++ b/usr.sbin/rtadvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2021/02/03 06:50:07 roy Exp $
+# $NetBSD: Makefile,v 1.27 2023/06/03 09:09:23 lukem Exp $
WARNS?= 4
@@ -31,7 +31,7 @@ LDADD.rump+= -lrumpres
DPADD.rump+= ${LIBRUMPRES}
.endif
-COPTS.if.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.config.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.if.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.config.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile
index 329e4f13ebf..873240f94ca 100644
--- a/usr.sbin/rwhod/Makefile
+++ b/usr.sbin/rwhod/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:21 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2023/06/03 09:09:23 lukem Exp $
.include <bsd.own.mk>
@@ -15,6 +15,6 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
LDADD+= -lutil
DPADD+= ${LIBUTIL}
-COPTS.rwhod.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.rwhod.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/sliplogin/Makefile b/usr.sbin/sliplogin/Makefile
index eaabc4ed907..cdd45ec9544 100644
--- a/usr.sbin/sliplogin/Makefile
+++ b/usr.sbin/sliplogin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:21 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 09:09:23 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 7/19/93
USE_FORT?= yes # setuid
@@ -14,6 +14,6 @@ FILESDIR= /usr/share/examples/slip
FILES= slip.login
.endif
-COPTS.sliplogin.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.sliplogin.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile
index 76a27f2d032..afc2d4f1369 100644
--- a/usr.sbin/spray/Makefile
+++ b/usr.sbin/spray/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:21 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:24 lukem Exp $
PROG= spray
MAN= spray.8
LDADD+= -lrpcsvc
DPADD+= ${LIBRPCSVC}
-COPTS.spray.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.spray.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.sbin/srtconfig/Makefile b/usr.sbin/srtconfig/Makefile
index be3efee81a6..cb4996c618e 100644
--- a/usr.sbin/srtconfig/Makefile
+++ b/usr.sbin/srtconfig/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2020/02/09 15:10:31 fox Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 09:09:24 lukem Exp $
# This file is in the public domain.
PROG= srtconfig
SRCS= srtconfig.c
-COPTS.srtconfig.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.srtconfig.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/sysinst/Makefile.inc b/usr.sbin/sysinst/Makefile.inc
index 74388a779fd..d0f37d6a2fa 100644
--- a/usr.sbin/sysinst/Makefile.inc
+++ b/usr.sbin/sysinst/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.45 2022/01/09 16:39:50 martin Exp $
+# $NetBSD: Makefile.inc,v 1.46 2023/06/03 09:09:24 lukem Exp $
#
# Makefile for sysinst
@@ -144,8 +144,8 @@ COPTS += -Os
CPPFLAGS+=-DINET6
.endif
-COPTS+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.disklabel.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.disklabel.c+= ${CC_WNO_STRINGOP_TRUNCATION}
# Host to ftp from. Default:
# "ftp.NetBSD.org"
@@ -256,7 +256,7 @@ check-lang: msg.def msg_defs.h
${HOST_SH} ${MSG_CMP_SH} msg_defs.h /tmp/sysinst.en sysinstmsgs.${LANG}
@rm /tmp/sysinst.en
-COPTS.util.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.util.c+= ${CC_WNO_STRINGOP_TRUNCATION}
COPTS+= -fcommon
.include <bsd.prog.mk>
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index 95d79eca259..81e37442e5f 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2023/05/09 20:10:07 christos Exp $
+# $NetBSD: Makefile,v 1.33 2023/06/03 09:09:24 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -31,7 +31,7 @@ DPADD+= ${LIBWRAP} ${LIBBLOCKLIST}
LDADD+= -lssl -lcrypto
# Overflow that appears impossible
-COPTS.syslogd.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.syslogd.c+= ${CC_WNO_FORMAT_TRUNCATION} ${CC_WNO_STRINGOP_TRUNCATION}
COPTS.tls.c+= -Wno-error=deprecated-declarations
COPTS.sign.c+= -Wno-error=deprecated-declarations
diff --git a/usr.sbin/timed/timed/Makefile b/usr.sbin/timed/timed/Makefile
index 81ae538d837..ad35d130077 100644
--- a/usr.sbin/timed/timed/Makefile
+++ b/usr.sbin/timed/timed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/02/09 15:13:28 fox Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/03 09:09:24 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
#
# optional flags are: MEASURE TESTING DEBUG
@@ -13,6 +13,6 @@ MAN= timed.8
CWARNFLAGS.clang+= -Wno-error=implicit-int-float-conversion
-COPTS.master.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.master.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/wiconfig/Makefile b/usr.sbin/wiconfig/Makefile
index e680a3c711b..973c6ddfd36 100644
--- a/usr.sbin/wiconfig/Makefile
+++ b/usr.sbin/wiconfig/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:22 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 09:09:24 lukem Exp $
PROG= wiconfig
MAN= wiconfig.8
-COPTS.wiconfig.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.wiconfig.c+= ${CC_WNO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile
index bca81074890..a927e95851b 100644
--- a/usr.sbin/ypbind/Makefile
+++ b/usr.sbin/ypbind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/10/13 07:28:22 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2023/06/03 09:09:24 lukem Exp $
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
USE_FORT?= yes # network client
@@ -10,6 +10,6 @@ CPPFLAGS+=-DHEURISTIC -DDEBUG
LDADD+= -lutil
DPADD+= ${LIBUTIL}
-COPTS.ypbind.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.ypbind.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.sbin/ypserv/makedbm/Makefile b/usr.sbin/ypserv/makedbm/Makefile
index dafc7bc068c..45e8582c214 100644
--- a/usr.sbin/ypserv/makedbm/Makefile
+++ b/usr.sbin/ypserv/makedbm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2020/02/09 15:52:48 fox Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 09:09:24 lukem Exp $
PROG= makedbm
MAN= makedbm.8
-CWARNFLAGS+= ${GCC_NO_FORMAT_TRUNCATION}
+CWARNFLAGS+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/usr.sbin/ypserv/yppush/Makefile b/usr.sbin/ypserv/yppush/Makefile
index 49cf108e03e..8d21b262fc8 100644
--- a/usr.sbin/ypserv/yppush/Makefile
+++ b/usr.sbin/ypserv/yppush/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:22 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 09:09:24 lukem Exp $
PROG= yppush
SRCS= yppush.c yppush_err.c yppush_proc.c yppush_svc.c
MAN= yppush.8
-COPTS.yppush.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
-COPTS.yppush_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.yppush.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
+COPTS.yppush_svc.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.sbin/ypserv/ypserv/Makefile b/usr.sbin/ypserv/ypserv/Makefile
index 449983d67b7..e09164e4ce4 100644
--- a/usr.sbin/ypserv/ypserv/Makefile
+++ b/usr.sbin/ypserv/ypserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/03/07 15:09:13 christos Exp $
+# $NetBSD: Makefile,v 1.22 2023/06/03 09:09:25 lukem Exp $
.include <bsd.own.mk>
@@ -20,6 +20,6 @@ CPPFLAGS.getnetnamadr.c=-UYP -D_LIBC
SANITIZER_RENAME_SYMBOL+= gethostbyname2
-COPTS.ypserv.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.ypserv.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.sbin/ypserv/ypxfr/Makefile b/usr.sbin/ypserv/ypxfr/Makefile
index 1b42d04e0f9..af4763f0453 100644
--- a/usr.sbin/ypserv/ypxfr/Makefile
+++ b/usr.sbin/ypserv/ypxfr/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:22 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 09:09:25 lukem Exp $
PROG= ypxfr
SRCS= ypxfr.c
MAN= ypxfr.8
-COPTS.ypxfr.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.ypxfr.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>
diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile
index 92edcf8195e..782de196979 100644
--- a/usr.sbin/ypset/Makefile
+++ b/usr.sbin/ypset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:23 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 09:09:25 lukem Exp $
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
USE_FORT?= yes # network client
@@ -6,6 +6,6 @@ USE_FORT?= yes # network client
PROG= ypset
MAN= ypset.8
-COPTS.ypset.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.ypset.c+= ${CC_WNO_CAST_FUNCTION_TYPE}
.include <bsd.prog.mk>