Module Name: src
Committed By: lukem
Date: Sat Jun 3 08:53:01 UTC 2023
Modified Files:
src/external/apache2/llvm/lib/libLLVMInstCombine: Makefile
src/external/apache2/llvm/lib/libLLVMInstrumentation: Makefile
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
src/external/bsd/ipf: Makefile.inc
src/external/bsd/ipf/bin/ipmon: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/tcpdump/bin: Makefile
src/external/bsd/wpa/bin/hostapd: Makefile
src/external/gpl3/gcc: README.warnings
src/external/gpl3/gcc.old: README.warnings
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
src/lib/libc/net: Makefile.inc
src/libexec/identd: Makefile
src/sbin/dump: Makefile
src/sbin/fsck_ffs: Makefile
src/sbin/fsck_udf: Makefile
src/sbin/fsck_v7fs: Makefile
src/sbin/fsdb: Makefile
src/sbin/newfs: Makefile
src/sbin/newfs_udf: Makefile
src/sbin/newfs_v7fs: Makefile
src/sbin/nvmectl: Makefile
src/share/mk: bsd.kmodule.mk bsd.own.mk
src/sys/arch/bebox/stand/boot: Makefile
src/sys/arch/i386/stand: Makefile.booters
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
src/sys/arch/i386/stand/efiboot: Makefile.efiboot
src/sys/arch/i386/stand/efiboot/bootx64: Makefile
src/sys/arch/i386/stand/lib: Makefile
src/sys/arch/macppc/stand: Makefile.inc
src/sys/arch/mipsco/stand/installboot: Makefile
src/sys/arch/prep/stand/boot: Makefile
src/sys/arch/sparc/stand/boot: Makefile
src/sys/arch/sparc/stand/bootxx: Makefile
src/sys/arch/sparc/stand/ofwboot: Makefile
src/sys/arch/sun3/conf: Makefile.sun3
src/sys/arch/zaurus/stand: Makefile.inc
src/sys/conf: Makefile.kern.inc copts.mk
src/sys/modules/ffs: Makefile
src/sys/modules/ipl: Makefile
src/sys/modules/npf: Makefile
src/sys/modules/pf: Makefile
src/sys/modules/slcompress: Makefile
src/sys/modules/udf: Makefile
src/sys/modules/v7fs: Makefile
src/sys/rump/fs/lib/libffs: Makefile
src/sys/rump/fs/lib/libmsdos: Makefile
src/sys/rump/fs/lib/libudf: Makefile
src/sys/rump/fs/lib/libv7fs: Makefile
src/sys/rump/fs/lib/libzfs: Makefile
src/sys/rump/net/lib: Makefile.inc
src/sys/stand/efiboot: Makefile.efiboot
src/tests/lib/libc/sys: Makefile
src/usr.bin/kdump: Makefile
src/usr.bin/ktruss: Makefile
src/usr.sbin/bootp/common: Makefile
src/usr.sbin/fstyp: Makefile
src/usr.sbin/installboot: Makefile
src/usr.sbin/makefs/udf: Makefile.inc
src/usr.sbin/map-mbone: Makefile
src/usr.sbin/mrinfo: Makefile
src/usr.sbin/mrouted: Makefile
src/usr.sbin/mtrace: Makefile
src/usr.sbin/ndbootd: Makefile
src/usr.sbin/pf: Makefile.inc
src/usr.sbin/racoon: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/llvm/lib/libLLVMInstCombine/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/llvm/lib/libLLVMInstrumentation/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ipf/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ipf/bin/ipmon/Makefile
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/README.warnings
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc.old/README.warnings
cvs rdiff -u -r1.34 -r1.35 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
cvs rdiff -u -r1.92 -r1.93 src/lib/libc/net/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/libexec/identd/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sbin/dump/Makefile
cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck_ffs/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sbin/fsck_udf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sbin/fsck_v7fs/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sbin/fsdb/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sbin/newfs/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sbin/newfs_udf/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sbin/newfs_v7fs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sbin/nvmectl/Makefile
cvs rdiff -u -r1.82 -r1.83 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.1335 -r1.1336 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/bebox/stand/boot/Makefile
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/i386/stand/Makefile.booters
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/stand/efiboot/bootx64/Makefile
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/i386/stand/lib/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/macppc/stand/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mipsco/stand/installboot/Makefile
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/prep/stand/boot/Makefile
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/sparc/stand/boot/Makefile
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sparc/stand/bootxx/Makefile
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/sparc/stand/ofwboot/Makefile
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/sun3/conf/Makefile.sun3
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/stand/Makefile.inc
cvs rdiff -u -r1.295 -r1.296 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.7 -r1.8 src/sys/conf/copts.mk
cvs rdiff -u -r1.23 -r1.24 src/sys/modules/ffs/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/ipl/Makefile
cvs rdiff -u -r1.29 -r1.30 src/sys/modules/npf/Makefile
cvs rdiff -u -r1.16 -r1.17 src/sys/modules/pf/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/slcompress/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/udf/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/v7fs/Makefile
cvs rdiff -u -r1.21 -r1.22 src/sys/rump/fs/lib/libffs/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/fs/lib/libmsdos/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/fs/lib/libudf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/fs/lib/libv7fs/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/fs/lib/libzfs/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/net/lib/Makefile.inc
cvs rdiff -u -r1.26 -r1.27 src/sys/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.72 -r1.73 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/kdump/Makefile
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/ktruss/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/bootp/common/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/fstyp/Makefile
cvs rdiff -u -r1.56 -r1.57 src/usr.sbin/installboot/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/makefs/udf/Makefile.inc
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/map-mbone/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/mrinfo/Makefile
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/mrouted/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mtrace/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/ndbootd/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/pf/Makefile.inc
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/racoon/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/llvm/lib/libLLVMInstCombine/Makefile
diff -u src/external/apache2/llvm/lib/libLLVMInstCombine/Makefile:1.3 src/external/apache2/llvm/lib/libLLVMInstCombine/Makefile:1.4
--- src/external/apache2/llvm/lib/libLLVMInstCombine/Makefile:1.3 Sun May 30 01:56:53 2021
+++ src/external/apache2/llvm/lib/libLLVMInstCombine/Makefile Sat Jun 3 08:52:53 2023
@@ -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}
Index: src/external/apache2/llvm/lib/libLLVMInstrumentation/Makefile
diff -u src/external/apache2/llvm/lib/libLLVMInstrumentation/Makefile:1.3 src/external/apache2/llvm/lib/libLLVMInstrumentation/Makefile:1.4
--- src/external/apache2/llvm/lib/libLLVMInstrumentation/Makefile:1.3 Sun May 30 01:56:53 2021
+++ src/external/apache2/llvm/lib/libLLVMInstrumentation/Makefile Sat Jun 3 08:52:53 2023
@@ -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}
Index: src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
diff -u src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.14 src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.15
--- src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.14 Tue Apr 13 06:25:48 2021
+++ src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile Sat Jun 3 08:52:53 2023
@@ -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-protect
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}
Index: src/external/bsd/ipf/Makefile.inc
diff -u src/external/bsd/ipf/Makefile.inc:1.6 src/external/bsd/ipf/Makefile.inc:1.7
--- src/external/bsd/ipf/Makefile.inc:1.6 Tue Jan 5 11:07:59 2021
+++ src/external/bsd/ipf/Makefile.inc Sat Jun 3 08:52:53 2023
@@ -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>
Index: src/external/bsd/ipf/bin/ipmon/Makefile
diff -u src/external/bsd/ipf/bin/ipmon/Makefile:1.4 src/external/bsd/ipf/bin/ipmon/Makefile:1.5
--- src/external/bsd/ipf/bin/ipmon/Makefile:1.4 Sun Sep 6 07:20:26 2020
+++ src/external/bsd/ipf/bin/ipmon/Makefile Sat Jun 3 08:52:53 2023
@@ -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>
Index: src/external/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.29 src/external/bsd/ntp/bin/ntpd/Makefile:1.30
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.29 Tue May 9 20:51:14 2023
+++ src/external/bsd/ntp/bin/ntpd/Makefile Sat Jun 3 08:52:54 2023
@@ -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_STRINGO
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}
Index: src/external/bsd/tcpdump/bin/Makefile
diff -u src/external/bsd/tcpdump/bin/Makefile:1.22 src/external/bsd/tcpdump/bin/Makefile:1.23
--- src/external/bsd/tcpdump/bin/Makefile:1.22 Tue May 9 20:55:39 2023
+++ src/external/bsd/tcpdump/bin/Makefile Sat Jun 3 08:52:54 2023
@@ -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
Index: src/external/bsd/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.16 src/external/bsd/wpa/bin/hostapd/Makefile:1.17
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.16 Tue May 9 21:05:24 2023
+++ src/external/bsd/wpa/bin/hostapd/Makefile Sat Jun 3 08:52:54 2023
@@ -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-i
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
Index: src/external/gpl3/gcc/README.warnings
diff -u src/external/gpl3/gcc/README.warnings:1.1 src/external/gpl3/gcc/README.warnings:1.2
--- src/external/gpl3/gcc/README.warnings:1.1 Thu Apr 15 05:15:04 2021
+++ src/external/gpl3/gcc/README.warnings Sat Jun 3 08:52:54 2023
@@ -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
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:
Index: src/external/gpl3/gcc.old/README.warnings
diff -u src/external/gpl3/gcc.old/README.warnings:1.2 src/external/gpl3/gcc.old/README.warnings:1.3
--- src/external/gpl3/gcc.old/README.warnings:1.2 Mon Feb 20 02:11:03 2023
+++ src/external/gpl3/gcc.old/README.warnings Sat Jun 3 08:52:54 2023
@@ -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
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:
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.34 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.35
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.34 Sun May 30 22:24:35 2021
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Sat Jun 3 08:52:54 2023
@@ -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
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
Index: src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.14 Mon Sep 7 00:24:37 2020
+++ src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile Sat Jun 3 08:52:54 2023
@@ -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}
Index: src/lib/libc/net/Makefile.inc
diff -u src/lib/libc/net/Makefile.inc:1.92 src/lib/libc/net/Makefile.inc:1.93
--- src/lib/libc/net/Makefile.inc:1.92 Mon Apr 12 06:08:30 2021
+++ src/lib/libc/net/Makefile.inc Sat Jun 3 08:52:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.92 2021/04/12 06:08:30 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.93 2023/06/03 08:52:54 lukem Exp $
# @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
# net sources
@@ -152,4 +152,4 @@ MAN+= sctp_bindx.3 sctp_connectx.3 sctp_
sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3
COPTS.getaddrinfo.c+= ${GCC_NO_STRINGOP_OVERFLOW}
-COPTS.sctp_sys_calls.c+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+COPTS.sctp_sys_calls.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
Index: src/libexec/identd/Makefile
diff -u src/libexec/identd/Makefile:1.19 src/libexec/identd/Makefile:1.20
--- src/libexec/identd/Makefile:1.19 Sun Sep 6 07:20:26 2020
+++ src/libexec/identd/Makefile Sat Jun 3 08:52:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/09/06 07:20:26 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2023/06/03 08:52:54 lukem Exp $
.include <bsd.own.mk>
@@ -28,6 +28,6 @@ DPADD+=${LIBNPF}
# XXX
COPTS+= -fno-strict-aliasing
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/sbin/dump/Makefile
diff -u src/sbin/dump/Makefile:1.41 src/sbin/dump/Makefile:1.42
--- src/sbin/dump/Makefile:1.41 Sun Sep 6 07:20:27 2020
+++ src/sbin/dump/Makefile Sat Jun 3 08:52:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2020/09/06 07:20:27 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2023/06/03 08:52:55 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# dump.h header file
@@ -39,7 +39,7 @@ LDADD+= -lutil
COPTS.ffs_inode.c+= -Wno-pointer-sign
COPTS.traverse.c+= ${GCC_NO_FORMAT_TRUNCATION}
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
CWARNFLAGS.gcc+= ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
Index: src/sbin/fsck_ffs/Makefile
diff -u src/sbin/fsck_ffs/Makefile:1.50 src/sbin/fsck_ffs/Makefile:1.51
--- src/sbin/fsck_ffs/Makefile:1.50 Sun Sep 6 07:20:27 2020
+++ src/sbin/fsck_ffs/Makefile Sat Jun 3 08:52:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2020/09/06 07:20:27 mrg Exp $
+# $NetBSD: Makefile,v 1.51 2023/06/03 08:52:55 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 4/27/95
# when making a change to this file, please check if the change is
@@ -13,7 +13,7 @@ SUBDIR.roff= SMM.doc
.include "Makefile.common"
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
Index: src/sbin/fsck_udf/Makefile
diff -u src/sbin/fsck_udf/Makefile:1.1 src/sbin/fsck_udf/Makefile:1.2
--- src/sbin/fsck_udf/Makefile:1.1 Wed Apr 6 13:35:50 2022
+++ src/sbin/fsck_udf/Makefile Sat Jun 3 08:52:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/04/06 13:35:50 reinoud Exp $
+# $NetBSD: Makefile,v 1.2 2023/06/03 08:52:55 lukem Exp $
.include <bsd.own.mk>
@@ -18,6 +18,6 @@ DPADD+=${LIBUTIL}
LDADD+=-lutil -lprop
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/sbin/fsck_v7fs/Makefile
diff -u src/sbin/fsck_v7fs/Makefile:1.3 src/sbin/fsck_v7fs/Makefile:1.4
--- src/sbin/fsck_v7fs/Makefile:1.3 Sun Sep 6 07:20:27 2020
+++ src/sbin/fsck_v7fs/Makefile Sat Jun 3 08:52:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/09/06 07:20:27 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 08:52:55 lukem Exp $
.include <bsd.own.mk>
@@ -17,6 +17,6 @@ CPPFLAGS+= -I${FSCK} -I${V7FS} -DV7FS_EI
LDADD+=-lutil
DPADD+=${LIBUTIL}
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/sbin/fsdb/Makefile
diff -u src/sbin/fsdb/Makefile:1.41 src/sbin/fsdb/Makefile:1.42
--- src/sbin/fsdb/Makefile:1.41 Thu Apr 15 01:56:00 2021
+++ src/sbin/fsdb/Makefile Sat Jun 3 08:52:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2021/04/15 01:56:00 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2023/06/03 08:52:55 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -45,6 +45,6 @@ COPTS.inode.c+= -O0
COPTS.fsdb.c+= -O0
.endif
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/sbin/newfs/Makefile
diff -u src/sbin/newfs/Makefile:1.41 src/sbin/newfs/Makefile:1.42
--- src/sbin/newfs/Makefile:1.41 Sun Sep 6 07:20:27 2020
+++ src/sbin/newfs/Makefile Sat Jun 3 08:52:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2020/09/06 07:20:27 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2023/06/03 08:52:55 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 3/27/94
# when making a change to this file, please check if the change is
@@ -15,6 +15,6 @@ MLINKS= mount_mfs.8 mfs.8
.include "Makefile.common"
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/sbin/newfs_udf/Makefile
diff -u src/sbin/newfs_udf/Makefile:1.8 src/sbin/newfs_udf/Makefile:1.9
--- src/sbin/newfs_udf/Makefile:1.8 Wed Apr 6 13:29:15 2022
+++ src/sbin/newfs_udf/Makefile Sat Jun 3 08:52:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/04/06 13:29:15 reinoud Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 08:52:55 lukem Exp $
.include <bsd.own.mk>
@@ -16,6 +16,6 @@ DPADD+=${LIBUTIL}
LDADD+=-lutil -lprop
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/sbin/newfs_v7fs/Makefile
diff -u src/sbin/newfs_v7fs/Makefile:1.5 src/sbin/newfs_v7fs/Makefile:1.6
--- src/sbin/newfs_v7fs/Makefile:1.5 Sun Sep 6 07:20:28 2020
+++ src/sbin/newfs_v7fs/Makefile Sat Jun 3 08:52:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/09/06 07:20:28 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 08:52:55 lukem Exp $
.include <bsd.own.mk>
@@ -18,6 +18,6 @@ CPPFLAGS+=-DV7FS_EI -I${V7FS} -I${FSCK}
COPTS.newfs_v7fs.c+= -Wno-pointer-sign
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/sbin/nvmectl/Makefile
diff -u src/sbin/nvmectl/Makefile:1.5 src/sbin/nvmectl/Makefile:1.6
--- src/sbin/nvmectl/Makefile:1.5 Sun Sep 6 07:20:28 2020
+++ src/sbin/nvmectl/Makefile Sat Jun 3 08:52:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/09/06 07:20:28 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 08:52:56 lukem Exp $
.include <bsd.own.mk>
@@ -20,6 +20,6 @@ MAN= nvmectl.8
DPADD+= ${LIBUTIL}
LDADD+= -lutil
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.82 src/share/mk/bsd.kmodule.mk:1.83
--- src/share/mk/bsd.kmodule.mk:1.82 Sun May 7 12:41:48 2023
+++ src/share/mk/bsd.kmodule.mk Sat Jun 3 08:52:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.82 2023/05/07 12:41:48 skrll Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.83 2023/06/03 08:52:56 lukem Exp $
# We are not building this with PIE
MKPIE=no
@@ -38,7 +38,7 @@ CWARNFLAGS.clang+= -Wno-error=constant-c
CFLAGS+= -fno-strict-aliasing
CWARNFLAGS+= -Wno-pointer-sign -Wno-attributes
CWARNFLAGS+= -Wno-type-limits
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
# XXX This is a workaround for platforms that have relative relocations
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1335 src/share/mk/bsd.own.mk:1.1336
--- src/share/mk/bsd.own.mk:1.1335 Fri Jun 2 14:30:23 2023
+++ src/share/mk/bsd.own.mk Sat Jun 3 08:52:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1335 2023/06/02 14:30:23 lukem Exp $
+# $NetBSD: bsd.own.mk,v 1.1336 2023/06/03 08:52:56 lukem Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -882,23 +882,16 @@ GCC_NO_STRINGOP_OVERFLOW= ${${ACTIVE_CC}
GCC_NO_IMPLICIT_FALLTHRU= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-implicit-fallthrough :}
GCC_NO_STRINGOP_TRUNCATION= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-stringop-truncation :}
GCC_NO_CAST_FUNCTION_TYPE= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-cast-function-type :}
-GCC_NO_ADDR_OF_PACKED_MEMBER= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-address-of-packed-member :}
GCC_NO_MAYBE_UNINITIALIZED= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-maybe-uninitialized :}
GCC_NO_RETURN_LOCAL_ADDR= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-return-local-addr :}
#
-# CLANG_NO_*: Disable specific warnings from Clang.
+# CC_NO_*: Disable specific compiler warnings from both Clang and GCC.
# Use these with e.g.
-# COPTS.foo.c+= ${CLANG_NO_ADDR_OF_PACKED_MEMBER}
+# COPTS.foo.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
#
-CLANG_NO_ADDR_OF_PACKED_MEMBER= ${${ACTIVE_CC} == "clang" :? -Wno-error=address-of-packed-member :}
-
-#
-# CC_NO_*: Disable specific warnings from both Clang and GCC.
-# Use these with e.g.
-# COPTS.foo.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
-#
-CC_NO_ADDR_OF_PACKED_MEMBER= ${CLANG_NO_ADDR_OF_PACKED_MEMBER} ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CC_WNO_ADDRESS_OF_PACKED_MEMBER=${${ACTIVE_CC} == "clang" :? -Wno-error=address-of-packed-member :} \
+ ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-address-of-packed-member :}
#
# The ia64 port is incomplete.
Index: src/sys/arch/bebox/stand/boot/Makefile
diff -u src/sys/arch/bebox/stand/boot/Makefile:1.36 src/sys/arch/bebox/stand/boot/Makefile:1.37
--- src/sys/arch/bebox/stand/boot/Makefile:1.36 Mon Sep 7 22:22:17 2020
+++ src/sys/arch/bebox/stand/boot/Makefile Sat Jun 3 08:52:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2020/09/07 22:22:17 mrg Exp $
+# $NetBSD: Makefile,v 1.37 2023/06/03 08:52:56 lukem Exp $
NOMAN= # defined
@@ -69,7 +69,7 @@ ${PROG}: ${OBJS} ${LIBS}
.include "${S}/conf/newvers_stand.mk"
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
.include <bsd.klinks.mk>
Index: src/sys/arch/i386/stand/Makefile.booters
diff -u src/sys/arch/i386/stand/Makefile.booters:1.95 src/sys/arch/i386/stand/Makefile.booters:1.96
--- src/sys/arch/i386/stand/Makefile.booters:1.95 Wed Jan 18 12:28:54 2023
+++ src/sys/arch/i386/stand/Makefile.booters Sat Jun 3 08:52:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.95 2023/01/18 12:28:54 christos Exp $
+# $NetBSD: Makefile.booters,v 1.96 2023/06/03 08:52:56 lukem Exp $
NOLIBCSANITIZER=
NOSANITIZER=
@@ -114,7 +114,7 @@ ${BASE}.bin: ${STARTFILE} ${OBJS} ${LIBS
${STARTFILE} ${OBJS} ${LIBLIST} > ${BASE}.list
${OBJCOPY} -O binary ${BASE}.sym ${BASE}.bin
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
KLINK_MACHINE= i386
Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.75 src/sys/arch/i386/stand/boot/Makefile.boot:1.76
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.75 Sun Sep 6 07:20:28 2020
+++ src/sys/arch/i386/stand/boot/Makefile.boot Sat Jun 3 08:52:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.75 2020/09/06 07:20:28 mrg Exp $
+# $NetBSD: Makefile.boot,v 1.76 2023/06/03 08:52:56 lukem Exp $
S= ${.CURDIR}/../../../../..
@@ -154,7 +154,7 @@ ${PROG}: ${OBJS} ${LIBLIST} ${LDSCRIPT}
-Wl,-Map,${PROG}.map -Wl,-cref ${OBJS} $$bb ${LIBLIST}
${OBJCOPY} -O binary ${PROG}.sym ${PROG}
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
KLINK_MACHINE= i386
Index: src/sys/arch/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.52 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.53
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.52 Sun Sep 6 07:20:28 2020
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Sat Jun 3 08:52:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.52 2020/09/06 07:20:28 mrg Exp $
+# $NetBSD: Makefile.bootxx,v 1.53 2023/06/03 08:52:56 lukem Exp $
S= ${.CURDIR}/../../../../..
@@ -138,7 +138,7 @@ ${PROG}: ${OBJS} ${LIBLIST} ${LDSCRIPT}
echo "${PROG} size $$sz, $$((${BOOTXX_MAXSIZE} - $$sz)) free"; \
fi
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
KLINK_MACHINE= i386
Index: src/sys/arch/i386/stand/efiboot/Makefile.efiboot
diff -u src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.20 src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.21
--- src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.20 Sun Dec 25 22:14:05 2022
+++ src/sys/arch/i386/stand/efiboot/Makefile.efiboot Sat Jun 3 08:52:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.efiboot,v 1.20 2022/12/25 22:14:05 christos Exp $
+# $NetBSD: Makefile.efiboot,v 1.21 2023/06/03 08:52:56 lukem Exp $
S= ${.CURDIR}/../../../../..
@@ -144,7 +144,7 @@ ${PROG}.so: ${OBJS} ${LIBLIST} ${LDSCRIP
rm -f ${.TARGET}
mv ${.TARGET}.tmp ${.TARGET}
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
KLINK_MACHINE?= ${MACHINE}
.include <bsd.klinks.mk>
Index: src/sys/arch/i386/stand/efiboot/bootx64/Makefile
diff -u src/sys/arch/i386/stand/efiboot/bootx64/Makefile:1.4 src/sys/arch/i386/stand/efiboot/bootx64/Makefile:1.5
--- src/sys/arch/i386/stand/efiboot/bootx64/Makefile:1.4 Sun Sep 6 07:20:29 2020
+++ src/sys/arch/i386/stand/efiboot/bootx64/Makefile Sat Jun 3 08:52:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/09/06 07:20:29 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/03 08:52:56 lukem Exp $
PROG= bootx64.efi
OBJFMT= pei-x86-64
@@ -13,6 +13,6 @@ CPPFLAGS+= -DEFI_FUNCTION_WRAPPER
# accessors -- they don't actually dereference the resulting pointer,
# just use it for type-checking.
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include "${.CURDIR}/../Makefile.efiboot"
Index: src/sys/arch/i386/stand/lib/Makefile
diff -u src/sys/arch/i386/stand/lib/Makefile:1.48 src/sys/arch/i386/stand/lib/Makefile:1.49
--- src/sys/arch/i386/stand/lib/Makefile:1.48 Sun Sep 6 07:20:29 2020
+++ src/sys/arch/i386/stand/lib/Makefile Sat Jun 3 08:52:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2020/09/06 07:20:29 mrg Exp $
+# $NetBSD: Makefile,v 1.49 2023/06/03 08:52:57 lukem Exp $
S?= ${.CURDIR}/../../../..
@@ -32,7 +32,7 @@ SRCS+= realprot.S message.S message32.S
SRCS+= rasops.c vbe.c biosvbe.S
.if (${I386_INCLUDE_DISK} == "yes")
SRCS+= biosdisk.c biosdisk_ll.c bios_disk.S
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.endif
.if (${I386_INCLUDE_DOS} == "yes")
SRCS+= dosfile.c dos_file.S
Index: src/sys/arch/macppc/stand/Makefile.inc
diff -u src/sys/arch/macppc/stand/Makefile.inc:1.7 src/sys/arch/macppc/stand/Makefile.inc:1.8
--- src/sys/arch/macppc/stand/Makefile.inc:1.7 Mon Apr 12 03:55:40 2021
+++ src/sys/arch/macppc/stand/Makefile.inc Sat Jun 3 08:52:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2021/04/12 03:55:40 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2023/06/03 08:52:57 lukem Exp $
BINDIR= /usr/mdec
@@ -11,4 +11,4 @@ LINKFLAGS_UNWIND= --no-ld-generated-unwi
# accessors -- they don't actually dereference the resulting pointer,
# just use it for type-checking.
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
Index: src/sys/arch/mipsco/stand/installboot/Makefile
diff -u src/sys/arch/mipsco/stand/installboot/Makefile:1.2 src/sys/arch/mipsco/stand/installboot/Makefile:1.3
--- src/sys/arch/mipsco/stand/installboot/Makefile:1.2 Mon Sep 7 10:44:52 2020
+++ src/sys/arch/mipsco/stand/installboot/Makefile Sat Jun 3 08:52:57 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2020/09/07 10:44:52 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/03 08:52:57 lukem Exp $
PROG= installboot
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/sys/arch/prep/stand/boot/Makefile
diff -u src/sys/arch/prep/stand/boot/Makefile:1.32 src/sys/arch/prep/stand/boot/Makefile:1.33
--- src/sys/arch/prep/stand/boot/Makefile:1.32 Mon Sep 7 22:22:17 2020
+++ src/sys/arch/prep/stand/boot/Makefile Sat Jun 3 08:52:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2020/09/07 22:22:17 mrg Exp $
+# $NetBSD: Makefile,v 1.33 2023/06/03 08:52:57 lukem Exp $
NOMAN= # defined
@@ -66,7 +66,7 @@ ${PROG}: ${OBJS} ${LIBS}
.include "${S}/conf/newvers_stand.mk"
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
.include <bsd.klinks.mk>
Index: src/sys/arch/sparc/stand/boot/Makefile
diff -u src/sys/arch/sparc/stand/boot/Makefile:1.44 src/sys/arch/sparc/stand/boot/Makefile:1.45
--- src/sys/arch/sparc/stand/boot/Makefile:1.44 Sun Sep 6 07:20:29 2020
+++ src/sys/arch/sparc/stand/boot/Makefile Sat Jun 3 08:52:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2020/09/06 07:20:29 mrg Exp $
+# $NetBSD: Makefile,v 1.45 2023/06/03 08:52:57 lukem Exp $
STRIPFLAG=
PROGSOURCE= boot.c net.c netif_sun.c conf.c openfirm.c bootinfo.c \
@@ -18,7 +18,7 @@ SAMISCMAKEFLAGS= SA_USE_CREAD=yes
# accessors -- they don't actually dereference the resulting pointer,
# just use it for type-checking.
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include "../Makefile.buildboot"
Index: src/sys/arch/sparc/stand/bootxx/Makefile
diff -u src/sys/arch/sparc/stand/bootxx/Makefile:1.19 src/sys/arch/sparc/stand/bootxx/Makefile:1.20
--- src/sys/arch/sparc/stand/bootxx/Makefile:1.19 Sun Sep 6 07:20:29 2020
+++ src/sys/arch/sparc/stand/bootxx/Makefile Sat Jun 3 08:52:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/09/06 07:20:29 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2023/06/03 08:52:57 lukem Exp $
PROG= bootxx
PROGSOURCE= bootxx.c
@@ -14,7 +14,7 @@ CLEANFILES+= ${PROG}.sym
# accessors -- they don't actually dereference the resulting pointer,
# just use it for type-checking.
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
# XXX SHOULD NOT NEED TO DEFINE THESE!
LIBCRT0=
Index: src/sys/arch/sparc/stand/ofwboot/Makefile
diff -u src/sys/arch/sparc/stand/ofwboot/Makefile:1.40 src/sys/arch/sparc/stand/ofwboot/Makefile:1.41
--- src/sys/arch/sparc/stand/ofwboot/Makefile:1.40 Sun Sep 6 07:20:29 2020
+++ src/sys/arch/sparc/stand/ofwboot/Makefile Sat Jun 3 08:52:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2020/09/06 07:20:29 mrg Exp $
+# $NetBSD: Makefile,v 1.41 2023/06/03 08:52:57 lukem Exp $
.include <bsd.init.mk>
@@ -42,7 +42,7 @@ CPPFLAGS+= -DSUPPORT_DHCP
# accessors -- they don't actually dereference the resulting pointer,
# just use it for type-checking.
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
LINKS+= ${BINDIR}/ofwboot ${BINDIR}/ofwboot.net
Index: src/sys/arch/sun3/conf/Makefile.sun3
diff -u src/sys/arch/sun3/conf/Makefile.sun3:1.110 src/sys/arch/sun3/conf/Makefile.sun3:1.111
--- src/sys/arch/sun3/conf/Makefile.sun3:1.110 Mon Sep 7 07:07:32 2020
+++ src/sys/arch/sun3/conf/Makefile.sun3 Sat Jun 3 08:52:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun3,v 1.110 2020/09/07 07:07:32 mrg Exp $
+# $NetBSD: Makefile.sun3,v 1.111 2023/06/03 08:52:57 lukem Exp $
# Makefile for NetBSD
#
@@ -35,7 +35,7 @@ CPPFLAGS+= -Dsun3
CFLAGS+= ${CMACHFLAGS} -fno-defer-pop
CFLAGS+= -msoft-float
AFLAGS+= -x assembler-with-cpp
-COPTS.sunmon.c+=${GCC_NO_ADDR_OF_PACKED_MEMBER} ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-error=array-bounds :}
+COPTS.sunmon.c+=${CC_WNO_ADDRESS_OF_PACKED_MEMBER} ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-error=array-bounds :}
##
## (3) libkern and compat
Index: src/sys/arch/zaurus/stand/Makefile.inc
diff -u src/sys/arch/zaurus/stand/Makefile.inc:1.8 src/sys/arch/zaurus/stand/Makefile.inc:1.9
--- src/sys/arch/zaurus/stand/Makefile.inc:1.8 Mon Apr 12 03:55:41 2021
+++ src/sys/arch/zaurus/stand/Makefile.inc Sat Jun 3 08:52:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2021/04/12 03:55:41 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.9 2023/06/03 08:52:57 lukem Exp $
BINDIR= /usr/mdec
KLINK_MACHINE= zaurus
@@ -7,4 +7,4 @@ KLINK_MACHINE= zaurus
# accessors -- they don't actually dereference the resulting pointer,
# just use it for type-checking.
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.295 src/sys/conf/Makefile.kern.inc:1.296
--- src/sys/conf/Makefile.kern.inc:1.295 Sat Aug 27 20:37:49 2022
+++ src/sys/conf/Makefile.kern.inc Sat Jun 3 08:52:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.295 2022/08/27 20:37:49 rillig Exp $
+# $NetBSD: Makefile.kern.inc,v 1.296 2023/06/03 08:52:58 lukem Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -97,7 +97,7 @@ CWARNFLAGS+= -Wno-sign-compare
CWARNFLAGS.clang+= -Wno-unknown-pragmas -Wno-conversion \
-Wno-self-assign -Wno-error=address-of-packed-member \
-Wno-error=constant-conversion
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC} == "clang":? \
-Wno-shift-count-negative -Wno-shift-count-overflow:}
Index: src/sys/conf/copts.mk
diff -u src/sys/conf/copts.mk:1.7 src/sys/conf/copts.mk:1.8
--- src/sys/conf/copts.mk:1.7 Sat Aug 27 20:42:16 2022
+++ src/sys/conf/copts.mk Sat Jun 3 08:52:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: copts.mk,v 1.7 2022/08/27 20:42:16 rillig Exp $
+# $NetBSD: copts.mk,v 1.8 2023/06/03 08:52:58 lukem Exp $
# MI per-file compiler options required.
@@ -22,8 +22,8 @@ COPTS.linux_machdep.c+= -Wno-error=unuse
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 10 && ${ACTIVE_CC} == "gcc"
COPTS.ath.c+= -Wno-error=enum-conversion
-COPTS.dpt.c+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
-COPTS.ffs_appleufs.c+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+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}
Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.23 src/sys/modules/ffs/Makefile:1.24
--- src/sys/modules/ffs/Makefile:1.23 Mon May 29 20:31:10 2023
+++ src/sys/modules/ffs/Makefile Sat Jun 3 08:52:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2023/05/29 20:31:10 lukem Exp $
+# $NetBSD: Makefile,v 1.24 2023/06/03 08:52:58 lukem Exp $
.include "../Makefile.inc"
@@ -9,7 +9,7 @@ CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS
CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH
CWARNFLAGS.clang= -Wno-conversion
-COPTS.ffs_appleufs.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
+COPTS.ffs_appleufs.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
SRCS+= ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_subr.c ffs_tables.c \
ffs_vfsops.c ffs_vnops.c ffs_snapshot.c ffs_extattr.c \
Index: src/sys/modules/ipl/Makefile
diff -u src/sys/modules/ipl/Makefile:1.7 src/sys/modules/ipl/Makefile:1.8
--- src/sys/modules/ipl/Makefile:1.7 Mon May 29 20:31:10 2023
+++ src/sys/modules/ipl/Makefile Sat Jun 3 08:52:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/05/29 20:31:10 lukem Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 08:52:58 lukem Exp $
#
.include "../Makefile.inc"
@@ -57,12 +57,12 @@ SRCS+= radix_ipf.c
WARNS= 3
CWARNFLAGS.clang+= -Wno-self-assign
-COPTS.fil.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
-COPTS.ip_fil_netbsd.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
-COPTS.ip_htable.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
-COPTS.ip_nat.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
-COPTS.ip_nat6.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
-COPTS.ip_proxy.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
-COPTS.ip_state.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
+COPTS.fil.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+COPTS.ip_fil_netbsd.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+COPTS.ip_htable.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+COPTS.ip_nat.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+COPTS.ip_nat6.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+COPTS.ip_proxy.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+COPTS.ip_state.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.kmodule.mk>
Index: src/sys/modules/npf/Makefile
diff -u src/sys/modules/npf/Makefile:1.29 src/sys/modules/npf/Makefile:1.30
--- src/sys/modules/npf/Makefile:1.29 Mon May 29 20:31:10 2023
+++ src/sys/modules/npf/Makefile Sat Jun 3 08:52:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2023/05/29 20:31:10 lukem Exp $
+# $NetBSD: Makefile,v 1.30 2023/06/03 08:52:58 lukem Exp $
#
# Public Domain.
#
@@ -21,7 +21,7 @@ SRCS+= nvlist.c nvpair.c nv_kern_netbsd
CPPFLAGS+= -DINET6
CPPFLAGS+= -I${S}/external/bsd/libnv/dist
-COPTS.npf_inet.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
+COPTS.npf_inet.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.kmodule.mk>
Index: src/sys/modules/pf/Makefile
diff -u src/sys/modules/pf/Makefile:1.16 src/sys/modules/pf/Makefile:1.17
--- src/sys/modules/pf/Makefile:1.16 Mon May 29 20:31:10 2023
+++ src/sys/modules/pf/Makefile Sat Jun 3 08:52:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/05/29 20:31:10 lukem Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 08:52:58 lukem Exp $
.include "../Makefile.inc"
@@ -25,8 +25,8 @@ WARNS= 3
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
COPTS.pf.c+= -Wno-error=implicit-fallthrough
.endif
-COPTS.pf.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
-COPTS.pf_norm.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
-COPTS.pf_table.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
+COPTS.pf.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+COPTS.pf_norm.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+COPTS.pf_table.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.kmodule.mk>
Index: src/sys/modules/slcompress/Makefile
diff -u src/sys/modules/slcompress/Makefile:1.5 src/sys/modules/slcompress/Makefile:1.6
--- src/sys/modules/slcompress/Makefile:1.5 Mon May 29 20:31:10 2023
+++ src/sys/modules/slcompress/Makefile Sat Jun 3 08:52:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/05/29 20:31:10 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 08:52:58 lukem Exp $
.include "../Makefile.inc"
@@ -9,7 +9,7 @@ SRCS= slcompress.c
CPPFLAGS+= -DINET
-COPTS.slcompress.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
+COPTS.slcompress.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
WARNS= 3
Index: src/sys/modules/udf/Makefile
diff -u src/sys/modules/udf/Makefile:1.7 src/sys/modules/udf/Makefile:1.8
--- src/sys/modules/udf/Makefile:1.7 Mon May 29 20:31:10 2023
+++ src/sys/modules/udf/Makefile Sat Jun 3 08:52:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/05/29 20:31:10 lukem Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 08:52:58 lukem Exp $
.include "../Makefile.inc"
@@ -13,7 +13,7 @@ WARNS= 3
CWARNFLAGS.clang= -Wno-self-assign
-COPTS.udf_allocation.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
-COPTS.udf_subr.c+= ${CC_NO_ADDR_OF_PACKED_MEMBER}
+COPTS.udf_allocation.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+COPTS.udf_subr.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.kmodule.mk>
Index: src/sys/modules/v7fs/Makefile
diff -u src/sys/modules/v7fs/Makefile:1.4 src/sys/modules/v7fs/Makefile:1.5
--- src/sys/modules/v7fs/Makefile:1.4 Mon May 29 20:31:09 2023
+++ src/sys/modules/v7fs/Makefile Sat Jun 3 08:52:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/05/29 20:31:09 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/03 08:52:58 lukem Exp $
.include "../Makefile.inc"
@@ -22,7 +22,7 @@ SRCS+= v7fs_extern.c
SRCS+= v7fs_vnops.c
SRCS+= v7fs_vfsops.c
-COPTS.v7fs_superblock.c += ${CC_NO_ADDR_OF_PACKED_MEMBER}
+COPTS.v7fs_superblock.c += ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
WARNS= 3
Index: src/sys/rump/fs/lib/libffs/Makefile
diff -u src/sys/rump/fs/lib/libffs/Makefile:1.21 src/sys/rump/fs/lib/libffs/Makefile:1.22
--- src/sys/rump/fs/lib/libffs/Makefile:1.21 Sun Sep 6 07:20:30 2020
+++ src/sys/rump/fs/lib/libffs/Makefile Sat Jun 3 08:52:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/09/06 07:20:30 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2023/06/03 08:52:59 lukem Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/ffs ${.CURDIR}/../../../../ufs/ufs
@@ -17,7 +17,7 @@ SRCS+= ufs_acl.c ufs_bmap.c ufs_dirhash.
CPPFLAGS+= -DFFS_EI -DUFS_DIRHASH -DWAPBL -DAPPLE_UFS -DUFS_EXTATTR \
-DQUOTA2 -DUFS_ACL
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER} ${GCC_NO_FORMAT_TRUNCATION}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER} ${GCC_NO_FORMAT_TRUNCATION}
CWARNFLAGS.gcc+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-error=restrict :}
.include <bsd.lib.mk>
Index: src/sys/rump/fs/lib/libmsdos/Makefile
diff -u src/sys/rump/fs/lib/libmsdos/Makefile:1.6 src/sys/rump/fs/lib/libmsdos/Makefile:1.7
--- src/sys/rump/fs/lib/libmsdos/Makefile:1.6 Sat Oct 23 07:41:38 2021
+++ src/sys/rump/fs/lib/libmsdos/Makefile Sat Jun 3 08:52:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/10/23 07:41:38 hannken Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 08:52:59 lukem Exp $
#
.PATH: ${.CURDIR}/../../../../fs/msdosfs
@@ -9,7 +9,7 @@ COMMENT=FAT
SRCS= msdosfs_conv.c msdosfs_fat.c msdosfs_vfsops.c msdosfs_denode.c \
msdosfs_lookup.c msdosfs_rename.c msdosfs_vnops.c msdosfs_unicode.c
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
Index: src/sys/rump/fs/lib/libudf/Makefile
diff -u src/sys/rump/fs/lib/libudf/Makefile:1.11 src/sys/rump/fs/lib/libudf/Makefile:1.12
--- src/sys/rump/fs/lib/libudf/Makefile:1.11 Sun Sep 6 07:20:30 2020
+++ src/sys/rump/fs/lib/libudf/Makefile Sat Jun 3 08:52:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/09/06 07:20:30 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2023/06/03 08:52:59 lukem Exp $
#
.PATH: ${.CURDIR}/../../../../fs/udf
@@ -12,7 +12,7 @@ SRCS= udf_osta.c udf_vfsops.c udf_vnops.
udf_rename.c
CWARNFLAGS.clang+= -Wno-self-assign -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
Index: src/sys/rump/fs/lib/libv7fs/Makefile
diff -u src/sys/rump/fs/lib/libv7fs/Makefile:1.3 src/sys/rump/fs/lib/libv7fs/Makefile:1.4
--- src/sys/rump/fs/lib/libv7fs/Makefile:1.3 Sun Sep 6 07:20:30 2020
+++ src/sys/rump/fs/lib/libv7fs/Makefile Sat Jun 3 08:52:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/09/06 07:20:30 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 08:52:59 lukem Exp $
#
.PATH: ${.CURDIR}/../../../../fs/v7fs
@@ -15,7 +15,7 @@ SRCS+= v7fs_io_kern.c v7fs_extern.c v7fs
CPPFLAGS+= -DV7FS_EI
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
Index: src/sys/rump/fs/lib/libzfs/Makefile
diff -u src/sys/rump/fs/lib/libzfs/Makefile:1.8 src/sys/rump/fs/lib/libzfs/Makefile:1.9
--- src/sys/rump/fs/lib/libzfs/Makefile:1.8 Thu Apr 15 17:31:15 2021
+++ src/sys/rump/fs/lib/libzfs/Makefile Sat Jun 3 08:52:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/04/15 17:31:15 christos Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 08:52:59 lukem Exp $
#
NEED_ISYSTEM= # Tell rump that we must use -isystem
@@ -14,7 +14,7 @@ COMMENT=ZFS
SRCS+= zfs_component.c
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
Index: src/sys/rump/net/lib/Makefile.inc
diff -u src/sys/rump/net/lib/Makefile.inc:1.8 src/sys/rump/net/lib/Makefile.inc:1.9
--- src/sys/rump/net/lib/Makefile.inc:1.8 Sun Sep 6 07:20:30 2020
+++ src/sys/rump/net/lib/Makefile.inc Sat Jun 3 08:52:59 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.8 2020/09/06 07:20:30 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.9 2023/06/03 08:52:59 lukem Exp $
#
RUMPTOP= ${.CURDIR}/../../..
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member -Werror=constant-conversion
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include "${RUMPTOP}/Makefile.rump"
Index: src/sys/stand/efiboot/Makefile.efiboot
diff -u src/sys/stand/efiboot/Makefile.efiboot:1.26 src/sys/stand/efiboot/Makefile.efiboot:1.27
--- src/sys/stand/efiboot/Makefile.efiboot:1.26 Fri Mar 25 21:23:00 2022
+++ src/sys/stand/efiboot/Makefile.efiboot Sat Jun 3 08:52:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.efiboot,v 1.26 2022/03/25 21:23:00 jmcneill Exp $
+# $NetBSD: Makefile.efiboot,v 1.27 2023/06/03 08:52:59 lukem Exp $
S= ${.CURDIR}/../../..
@@ -107,7 +107,7 @@ CPPFLAGS+= -DDEFAULT_TIMEOUT=5
# accessors -- they don't actually dereference the resulting pointer,
# just use it for type-checking.
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
SAMISCCPPFLAGS+= -DLIBSA_PRINTF_LONGLONG_SUPPORT
SAMISCCPPFLAGS+= -DLIBSA_PRINTF_WIDTH_SUPPORT
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.72 src/tests/lib/libc/sys/Makefile:1.73
--- src/tests/lib/libc/sys/Makefile:1.72 Mon Aug 1 15:48:39 2022
+++ src/tests/lib/libc/sys/Makefile Sat Jun 3 08:52:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2022/08/01 15:48:39 kre Exp $
+# $NetBSD: Makefile,v 1.73 2023/06/03 08:52:59 lukem Exp $
MKMAN= no
@@ -153,7 +153,7 @@ truncate_test.root_owned:
WARNS= 4
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER} \
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER} \
${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-error=deprecated :}
.include <bsd.test.mk>
Index: src/usr.bin/kdump/Makefile
diff -u src/usr.bin/kdump/Makefile:1.35 src/usr.bin/kdump/Makefile:1.36
--- src/usr.bin/kdump/Makefile:1.35 Sun Aug 22 22:24:12 2021
+++ src/usr.bin/kdump/Makefile Sat Jun 3 08:52:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2021/08/22 22:24:12 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2023/06/03 08:52:59 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk> # for MKDYNAMICROOT & NETBSDSRCDIR
@@ -25,6 +25,6 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktra
LDADD+=-lutil
DPADD+=${LIBUTIL}
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/usr.bin/ktruss/Makefile
diff -u src/usr.bin/ktruss/Makefile:1.32 src/usr.bin/ktruss/Makefile:1.33
--- src/usr.bin/ktruss/Makefile:1.32 Sun Aug 22 22:24:12 2021
+++ src/usr.bin/ktruss/Makefile Sat Jun 3 08:53:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2021/08/22 22:24:12 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2023/06/03 08:53:00 lukem Exp $
NOMAN= # defined
@@ -33,7 +33,7 @@ misc.c misc.h: ${DESTDIR}/usr/include/sy
CPPFLAGS+= -I. -I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys \
-I${NETBSDSRCDIR}/usr.bin/kdump -DKTRUSS -D_KERNTYPES
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/usr.sbin/bootp/common/Makefile
diff -u src/usr.sbin/bootp/common/Makefile:1.10 src/usr.sbin/bootp/common/Makefile:1.11
--- src/usr.sbin/bootp/common/Makefile:1.10 Sun May 30 02:28:35 2021
+++ src/usr.sbin/bootp/common/Makefile Sat Jun 3 08:53:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/05/30 02:28:35 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 08:53:00 lukem Exp $
LIBISPRIVATE= yes
@@ -7,6 +7,6 @@ SRCS= dovend.c dumptab.c getif.c hash.c
report.c tzone.c
CPPFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.lib.mk>
Index: src/usr.sbin/fstyp/Makefile
diff -u src/usr.sbin/fstyp/Makefile:1.12 src/usr.sbin/fstyp/Makefile:1.13
--- src/usr.sbin/fstyp/Makefile:1.12 Fri Sep 17 14:48:31 2021
+++ src/usr.sbin/fstyp/Makefile Sat Jun 3 08:53:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/09/17 14:48:31 christos Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 08:53:00 lukem Exp $
.include <bsd.own.mk>
@@ -32,6 +32,6 @@ CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/lib
.endif
CWARNFLAGS.clang+= -Wno-unknown-pragmas -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/usr.sbin/installboot/Makefile
diff -u src/usr.sbin/installboot/Makefile:1.56 src/usr.sbin/installboot/Makefile:1.57
--- src/usr.sbin/installboot/Makefile:1.56 Sun Sep 6 07:20:31 2020
+++ src/usr.sbin/installboot/Makefile Sat Jun 3 08:53:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2020/09/06 07:20:31 mrg Exp $
+# $NetBSD: Makefile,v 1.57 2023/06/03 08:53:00 lukem Exp $
#
.include <bsd.own.mk>
@@ -88,6 +88,6 @@ DPADD+= ${LIBUTIL}
.endif
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/usr.sbin/makefs/udf/Makefile.inc
diff -u src/usr.sbin/makefs/udf/Makefile.inc:1.6 src/usr.sbin/makefs/udf/Makefile.inc:1.7
--- src/usr.sbin/makefs/udf/Makefile.inc:1.6 Sun Apr 10 09:22:35 2022
+++ src/usr.sbin/makefs/udf/Makefile.inc Sat Jun 3 08:53:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2022/04/10 09:22:35 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.7 2023/06/03 08:53:00 lukem Exp $
#
UDF= ${NETBSDSRCDIR}/sys/fs/udf
@@ -17,4 +17,4 @@ LDADD+=-lutil -lprop
.endif
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member -Wno-error=constant-conversion
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
Index: src/usr.sbin/map-mbone/Makefile
diff -u src/usr.sbin/map-mbone/Makefile:1.10 src/usr.sbin/map-mbone/Makefile:1.11
--- src/usr.sbin/map-mbone/Makefile:1.10 Sun Sep 6 07:20:31 2020
+++ src/usr.sbin/map-mbone/Makefile Sat Jun 3 08:53:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/09/06 07:20:31 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 08:53:00 lukem Exp $
# from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp
.include <bsd.own.mk>
@@ -12,6 +12,6 @@ PROG= map-mbone
SRCS= igmp.c inet.c kern.c mapper.c
MAN= map-mbone.8
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/usr.sbin/mrinfo/Makefile
diff -u src/usr.sbin/mrinfo/Makefile:1.11 src/usr.sbin/mrinfo/Makefile:1.12
--- src/usr.sbin/mrinfo/Makefile:1.11 Sun Sep 6 07:20:32 2020
+++ src/usr.sbin/mrinfo/Makefile Sat Jun 3 08:53:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/09/06 07:20:32 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2023/06/03 08:53:00 lukem Exp $
# from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp
.include <bsd.own.mk>
@@ -14,6 +14,6 @@ MAN= mrinfo.8
BINOWN= root
BINMODE=4555
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/usr.sbin/mrouted/Makefile
diff -u src/usr.sbin/mrouted/Makefile:1.17 src/usr.sbin/mrouted/Makefile:1.18
--- src/usr.sbin/mrouted/Makefile:1.17 Sun Sep 6 07:20:32 2020
+++ src/usr.sbin/mrouted/Makefile Sat Jun 3 08:53:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/09/06 07:20:32 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2023/06/03 08:53:00 lukem Exp $
# from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ DPADD+= ${LIBUTIL}
CPPFLAGS+= -I${.CURDIR}
CWARNFLAGS.clang+= -Wno-format-extra-args
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.cfparse.c+= ${GCC_NO_STRINGOP_TRUNCATION}
COPTS.vif.c+= ${GCC_NO_STRINGOP_TRUNCATION}
Index: src/usr.sbin/mtrace/Makefile
diff -u src/usr.sbin/mtrace/Makefile:1.12 src/usr.sbin/mtrace/Makefile:1.13
--- src/usr.sbin/mtrace/Makefile:1.12 Sun Sep 6 07:20:32 2020
+++ src/usr.sbin/mtrace/Makefile Sat Jun 3 08:53:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/09/06 07:20:32 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 08:53:00 lukem Exp $
# from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp
.include <bsd.own.mk>
@@ -19,6 +19,6 @@ COPTS.mtrace.c=-O0
BINMODE=4555
BINOWN= root
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/usr.sbin/ndbootd/Makefile
diff -u src/usr.sbin/ndbootd/Makefile:1.8 src/usr.sbin/ndbootd/Makefile:1.9
--- src/usr.sbin/ndbootd/Makefile:1.8 Sun Sep 6 07:20:32 2020
+++ src/usr.sbin/ndbootd/Makefile Sat Jun 3 08:53:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/09/06 07:20:32 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 08:53:01 lukem Exp $
WARNS?= 1 # XXX -Wsign-compare -Wshadow
@@ -15,7 +15,7 @@ COPTS.ndbootd.c+= -fno-tree-ter -fno-tre
.endif
CWARNFLAGS.clang+= -Wno-tautological-compare
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.own.mk>
.include <bsd.prog.mk>
Index: src/usr.sbin/pf/Makefile.inc
diff -u src/usr.sbin/pf/Makefile.inc:1.11 src/usr.sbin/pf/Makefile.inc:1.12
--- src/usr.sbin/pf/Makefile.inc:1.11 Sun Sep 6 07:20:32 2020
+++ src/usr.sbin/pf/Makefile.inc Sat Jun 3 08:53:01 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.11 2020/09/06 07:20:32 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.12 2023/06/03 08:53:01 lukem Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
CWARNFLAGS.clang+= -Wno-tautological-compare
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
CPPFLAGS+= -D_OPENBSD_SOURCE
Index: src/usr.sbin/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.42 src/usr.sbin/racoon/Makefile:1.43
--- src/usr.sbin/racoon/Makefile:1.42 Tue May 9 20:11:54 2023
+++ src/usr.sbin/racoon/Makefile Sat Jun 3 08:53:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2023/05/09 20:11:54 christos Exp $
+# $NetBSD: Makefile,v 1.43 2023/06/03 08:53:01 lukem Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -81,7 +81,7 @@ prsa_tok.c: ${DIST}/src/racoon/prsa_tok.
prsa_par.c: ${DIST}/src/racoon/prsa_par.y
${YACC} -pprsa -d -o ${.TARGET} ${.ALLSRC}
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS+= -fcommon
COPTS.crypto_openssl.c+= -Wno-error=deprecated-declarations
