summaryrefslogtreecommitdiff
path: root/external
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 /external
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.
Diffstat (limited to 'external')
-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
57 files changed, 174 insertions, 174 deletions
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