summaryrefslogtreecommitdiff
path: root/usr.bin
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 /usr.bin
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 'usr.bin')
-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
32 files changed, 74 insertions, 74 deletions
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>