summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2023-06-03 08:52:53 +0000
committerlukem <lukem@NetBSD.org>2023-06-03 08:52:53 +0000
commitabaa8cb87058c08ad0688c849a28f4e007c07bbb (patch)
treeb605286f3fba170e6cbf35b5f30a1a915e19d120 /external
parent4e669cc7c9ec3b3364a9f7d56e92bdf770cca438 (diff)
bsd.own.mk: rename to CC_WNO_ADDRESS_OF_PACKED_MEMBER
Provide a single variable CC_WNO_ADDRESS_OF_PACKED_MEMBER with options for both clang and gcc, to replace CLANG_NO_ADDR_OF_PACKED_MEMBER CC_NO_ADDR_OF_PACKED_MEMBER GCC_NO_ADDR_OF_PACKED_MEMBER 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/libLLVMInstCombine/Makefile4
-rw-r--r--external/apache2/llvm/lib/libLLVMInstrumentation/Makefile4
-rw-r--r--external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile4
-rw-r--r--external/bsd/ipf/Makefile.inc4
-rw-r--r--external/bsd/ipf/bin/ipmon/Makefile4
-rw-r--r--external/bsd/ntp/bin/ntpd/Makefile4
-rw-r--r--external/bsd/tcpdump/bin/Makefile4
-rw-r--r--external/bsd/wpa/bin/hostapd/Makefile4
-rw-r--r--external/gpl3/gcc.old/README.warnings6
-rw-r--r--external/gpl3/gcc/README.warnings6
-rw-r--r--external/mit/xorg/server/drivers/xf86-video-intel/Makefile4
-rw-r--r--external/mit/xorg/server/drivers/xf86-video-vmware/Makefile4
12 files changed, 26 insertions, 26 deletions
diff --git a/external/apache2/llvm/lib/libLLVMInstCombine/Makefile b/external/apache2/llvm/lib/libLLVMInstCombine/Makefile
index 4e87346d279..b951a689ab8 100644
--- a/external/apache2/llvm/lib/libLLVMInstCombine/Makefile
+++ b/external/apache2/llvm/lib/libLLVMInstCombine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/05/30 01:56:53 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 08:52:53 lukem Exp $
LIB= LLVMInstCombine
@@ -28,4 +28,4 @@ SRCS+= InstCombineAddSub.cpp \
.include <bsd.lib.mk>
.endif
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
diff --git a/external/apache2/llvm/lib/libLLVMInstrumentation/Makefile b/external/apache2/llvm/lib/libLLVMInstrumentation/Makefile
index fb561c1d722..2009f34950d 100644
--- a/external/apache2/llvm/lib/libLLVMInstrumentation/Makefile
+++ b/external/apache2/llvm/lib/libLLVMInstrumentation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/05/30 01:56:53 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 08:52:53 lukem Exp $
LIB= LLVMInstrumentation
@@ -32,4 +32,4 @@ SRCS+= AddressSanitizer.cpp \
.include <bsd.lib.mk>
.endif
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
diff --git a/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile b/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
index 9a6a027a254..e131bc8b16b 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.14 2021/04/13 06:25:48 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/03 08:52:53 lukem Exp $
PROG= mdnsd
@@ -18,7 +18,7 @@ COPTS.uds_daemon.c += -Wno-stack-protector
MAN= mdnsd.8
CWARNFLAGS.clang+= -Wno-unused-value -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.DNSCommon.c+= ${GCC_NO_RETURN_LOCAL_ADDR}
diff --git a/external/bsd/ipf/Makefile.inc b/external/bsd/ipf/Makefile.inc
index 7f337228b0b..4cbeea00c51 100644
--- a/external/bsd/ipf/Makefile.inc
+++ b/external/bsd/ipf/Makefile.inc
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.6 2021/01/05 11:07:59 simonb Exp $
+# $NetBSD: Makefile.inc,v 1.7 2023/06/03 08:52:53 lukem Exp $
WARNS?= 1 # XXX -Wcast-qual -Wshadow
CWARNFLAGS.clang+= -Wno-format -Wno-tautological-compare \
-Wno-self-assign -Wno-array-bounds \
-Wno-error=unused-const-variable \
-Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.own.mk>
diff --git a/external/bsd/ipf/bin/ipmon/Makefile b/external/bsd/ipf/bin/ipmon/Makefile
index 96c32ac4f56..b1fe88e03ac 100644
--- a/external/bsd/ipf/bin/ipmon/Makefile
+++ b/external/bsd/ipf/bin/ipmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/09/06 07:20:26 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/03 08:52:53 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+= ${GCC_NO_ADDR_OF_PACKED_MEMBER} ${GCC_NO_FORMAT_OVERFLOW}
+COPTS.ipmon.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER} ${GCC_NO_FORMAT_OVERFLOW}
.include <bsd.prog.mk>
diff --git a/external/bsd/ntp/bin/ntpd/Makefile b/external/bsd/ntp/bin/ntpd/Makefile
index 597730045de..15e08f2ec04 100644
--- a/external/bsd/ntp/bin/ntpd/Makefile
+++ b/external/bsd/ntp/bin/ntpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2023/05/09 20:51:14 christos Exp $
+# $NetBSD: Makefile,v 1.30 2023/06/03 08:52:54 lukem Exp $
.include <bsd.own.mk>
@@ -95,7 +95,7 @@ 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_io.c+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+COPTS.ntp_io.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.ntp_crypto.c+= -Wno-error=deprecated-declarations
CLEANFILES+=${MAN}
diff --git a/external/bsd/tcpdump/bin/Makefile b/external/bsd/tcpdump/bin/Makefile
index 7b9e3ea0ae9..30eb0bfa830 100644
--- a/external/bsd/tcpdump/bin/Makefile
+++ b/external/bsd/tcpdump/bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2023/05/09 20:55:39 christos Exp $
+# $NetBSD: Makefile,v 1.23 2023/06/03 08:52:54 lukem Exp $
WARNS?= 1 # XXX: need to cleanup later
@@ -206,7 +206,7 @@ tcpdump.8: tcpdump.1.in
cp ${.ALLSRC} ${.TARGET}
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.print-bgp.c+= ${GCC_NO_FORMAT_TRUNCATION}
COPTS.signature.c+= -Wno-error=deprecated-declarations
COPTS.print-tcp.c+= -Wno-error=deprecated-declarations
diff --git a/external/bsd/wpa/bin/hostapd/Makefile b/external/bsd/wpa/bin/hostapd/Makefile
index 2d7f1293918..4decdc35159 100644
--- a/external/bsd/wpa/bin/hostapd/Makefile
+++ b/external/bsd/wpa/bin/hostapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/05/09 21:05:24 christos Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 08:52:54 lukem Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -246,7 +246,7 @@ SRCS+= tls_none.c sha1-internal.c md5-internal.c aes-xinternal.c rc4.c
SRCS+= sha1-pbkdf2.c sha1.c md5.c
.endif
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.dpp.c+= -Wno-error=deprecated-declarations
COPTS.crypto_openssl.c+= -Wno-error=deprecated-declarations
COPTS.fips_prf_openssl.c+= -Wno-error=deprecated-declarations
diff --git a/external/gpl3/gcc.old/README.warnings b/external/gpl3/gcc.old/README.warnings
index 7256380a0a9..14e8952cabf 100644
--- a/external/gpl3/gcc.old/README.warnings
+++ b/external/gpl3/gcc.old/README.warnings
@@ -1,4 +1,4 @@
-$NetBSD: README.warnings,v 1.2 2023/02/20 02:11:03 mrg Exp $
+$NetBSD: README.warnings,v 1.3 2023/06/03 08:52:54 lukem Exp $
What to do about GCC warnings and NetBSD.
@@ -19,7 +19,7 @@ modified for updates to warnings and new warnings.
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 += ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+ COPTS.foo.c += ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.foo.c += ${GCC_NO_MAYBE_UNINITIALIZED}
COPTS.foo.c += ${GCC_NO_RETURN_LOCAL_ADDR}
@@ -56,7 +56,7 @@ new GCC 9 warnings:
general family of string functions (str*(), etc.), and has
similar issues of false positives.
- bsd.own.mk variable: ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+ bsd.own.mk variable: ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
new GCC 8 warnings:
diff --git a/external/gpl3/gcc/README.warnings b/external/gpl3/gcc/README.warnings
index 619bf35540c..a6f4f35fc1c 100644
--- a/external/gpl3/gcc/README.warnings
+++ b/external/gpl3/gcc/README.warnings
@@ -1,4 +1,4 @@
-$NetBSD: README.warnings,v 1.1 2021/04/15 05:15:04 mrg Exp $
+$NetBSD: README.warnings,v 1.2 2023/06/03 08:52:54 lukem Exp $
What to do about GCC warnings and NetBSD.
@@ -19,7 +19,7 @@ modified for updates to warnings and new warnings.
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 += ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+ COPTS.foo.c += ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.foo.c += ${GCC_NO_MAYBE_UNINITIALIZED}
COPTS.foo.c += ${GCC_NO_RETURN_LOCAL_ADDR}
@@ -56,7 +56,7 @@ new GCC 9 warnings:
general family of string functions (str*(), etc.), and has
similar issues of false positives.
- bsd.own.mk variable: ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+ bsd.own.mk variable: ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
new GCC 8 warnings:
diff --git a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
index 54bab6b7a3a..af7ece342e3 100644
--- a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
+++ b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2021/05/30 22:24:35 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2023/06/03 08:52:54 lukem Exp $
.include <bsd.own.mk>
@@ -229,6 +229,6 @@ COPTS.sna_trapezoids_mono.c+= -Wno-stack-protector
COPTS.sna_trapezoids_precise.c+= -Wno-stack-protector
COPTS.i965_video.c+= -Wno-stack-protector
-COPTS.sna_damage.c+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+COPTS.sna_damage.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.sna_display.c+= -Wno-error # XXX deprecated
COPTS.intel_driver.c+= -Wno-error # XXX deprecated
diff --git a/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile b/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
index 0bb9607047b..2ecd86ed59e 100644
--- a/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
+++ b/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/09/07 00:24:37 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/03 08:52:54 lukem Exp $
DRIVER= xf86-video-vmware
DRIVER_NAME= vmware_drv
@@ -26,4 +26,4 @@ COPTS.vmwaremodes.c+= -Wno-error
.include "../Makefile.xf86-driver"
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}