summaryrefslogtreecommitdiff
path: root/sys
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 /sys
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 'sys')
-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
11 files changed, 33 insertions, 33 deletions
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"