summaryrefslogtreecommitdiff
path: root/sbin
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 /sbin
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 'sbin')
-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
13 files changed, 29 insertions, 29 deletions
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>