Module Name: src
Committed By: lukem
Date: Sat Jun 3 21:26:29 UTC 2023
Modified Files:
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
src/external/bsd/ipf: Makefile.inc
src/external/bsd/tcpdump/bin: Makefile
src/sbin/fsck_udf: Makefile
src/sbin/newfs_udf: Makefile
src/share/mk: bsd.kmodule.mk
src/sys/arch/i386/stand/efiboot/bootx64: Makefile
src/sys/arch/macppc/stand: Makefile.inc
src/sys/arch/sparc/stand/boot: Makefile
src/sys/arch/sparc/stand/bootxx: Makefile
src/sys/arch/sparc/stand/ofwboot: Makefile
src/sys/arch/zaurus/stand: Makefile.inc
src/sys/conf: Makefile.kern.inc
src/sys/rump/fs/lib/libudf: Makefile
src/sys/rump/net/lib: Makefile.inc
src/sys/stand/efiboot: Makefile.efiboot
src/usr.sbin/fstyp: Makefile
src/usr.sbin/installboot: Makefile
src/usr.sbin/makefs/udf: Makefile.inc
src/usr.sbin/pf: Makefile.inc
Log Message:
adapt to ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
Simplify CWARNFLAGS to use ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
which works for both clang and gcc, and remove compiler-specific
equivalents.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ipf/Makefile.inc
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sbin/fsck_udf/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sbin/newfs_udf/Makefile
cvs rdiff -u -r1.83 -r1.84 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/stand/efiboot/bootx64/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/macppc/stand/Makefile.inc
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sparc/stand/boot/Makefile
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc/stand/bootxx/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sparc/stand/ofwboot/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/stand/Makefile.inc
cvs rdiff -u -r1.296 -r1.297 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/fs/lib/libudf/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/net/lib/Makefile.inc
cvs rdiff -u -r1.27 -r1.28 src/sys/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/fstyp/Makefile
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/installboot/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makefs/udf/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/pf/Makefile.inc
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/mDNSResponder/usr.sbin/mdnsd/Makefile
diff -u src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.16 src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.17
--- src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.16 Sat Jun 3 09:09:02 2023
+++ src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile Sat Jun 3 21:26:27 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/06/03 09:09:02 lukem Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 21:26:27 lukem Exp $
PROG= mdnsd
@@ -17,8 +17,8 @@ COPTS.uds_daemon.c += -Wno-stack-protect
MAN= mdnsd.8
-CWARNFLAGS.clang+= -Wno-unused-value -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS.clang+= -Wno-unused-value
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.DNSCommon.c+= ${CC_WNO_RETURN_LOCAL_ADDR}
Index: src/external/bsd/ipf/Makefile.inc
diff -u src/external/bsd/ipf/Makefile.inc:1.8 src/external/bsd/ipf/Makefile.inc:1.9
--- src/external/bsd/ipf/Makefile.inc:1.8 Sat Jun 3 09:09:03 2023
+++ src/external/bsd/ipf/Makefile.inc Sat Jun 3 21:26:27 2023
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.8 2023/06/03 09:09:03 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.9 2023/06/03 21:26:27 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+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+ -Wno-error=unused-const-variable
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.own.mk>
Index: src/external/bsd/tcpdump/bin/Makefile
diff -u src/external/bsd/tcpdump/bin/Makefile:1.24 src/external/bsd/tcpdump/bin/Makefile:1.25
--- src/external/bsd/tcpdump/bin/Makefile:1.24 Sat Jun 3 09:09:05 2023
+++ src/external/bsd/tcpdump/bin/Makefile Sat Jun 3 21:26:27 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/06/03 09:09:05 lukem Exp $
+# $NetBSD: Makefile,v 1.25 2023/06/03 21:26:27 lukem Exp $
WARNS?= 1 # XXX: need to cleanup later
@@ -205,8 +205,7 @@ tcpdump.8: tcpdump.1.in
@rm -f ${.TARGET}
cp ${.ALLSRC} ${.TARGET}
-CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.print-bgp.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.signature.c+= -Wno-error=deprecated-declarations
COPTS.print-tcp.c+= -Wno-error=deprecated-declarations
Index: src/sbin/fsck_udf/Makefile
diff -u src/sbin/fsck_udf/Makefile:1.2 src/sbin/fsck_udf/Makefile:1.3
--- src/sbin/fsck_udf/Makefile:1.2 Sat Jun 3 08:52:55 2023
+++ src/sbin/fsck_udf/Makefile Sat Jun 3 21:26:27 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/06/03 08:52:55 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/03 21:26:27 lukem Exp $
.include <bsd.own.mk>
@@ -17,7 +17,6 @@ CPPFLAGS+= -I${FSCK} -I${KUDF} -I${NEWFS
DPADD+=${LIBUTIL}
LDADD+=-lutil -lprop
-CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/sbin/newfs_udf/Makefile
diff -u src/sbin/newfs_udf/Makefile:1.9 src/sbin/newfs_udf/Makefile:1.10
--- src/sbin/newfs_udf/Makefile:1.9 Sat Jun 3 08:52:55 2023
+++ src/sbin/newfs_udf/Makefile Sat Jun 3 21:26:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/06/03 08:52:55 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 21:26:28 lukem Exp $
.include <bsd.own.mk>
@@ -15,7 +15,6 @@ CPPFLAGS+= -I${MOUNT} -I${KUDF} -I${NETB
DPADD+=${LIBUTIL}
LDADD+=-lutil -lprop
-CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${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.83 src/share/mk/bsd.kmodule.mk:1.84
--- src/share/mk/bsd.kmodule.mk:1.83 Sat Jun 3 08:52:56 2023
+++ src/share/mk/bsd.kmodule.mk Sat Jun 3 21:26:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.83 2023/06/03 08:52:56 lukem Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.84 2023/06/03 21:26:28 lukem Exp $
# We are not building this with PIE
MKPIE=no
@@ -38,8 +38,7 @@ CWARNFLAGS.clang+= -Wno-error=constant-c
CFLAGS+= -fno-strict-aliasing
CWARNFLAGS+= -Wno-pointer-sign -Wno-attributes
CWARNFLAGS+= -Wno-type-limits
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
-CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
# XXX This is a workaround for platforms that have relative relocations
# that, when relocated by the module loader, result in addresses that
Index: src/sys/arch/i386/stand/efiboot/bootx64/Makefile
diff -u src/sys/arch/i386/stand/efiboot/bootx64/Makefile:1.5 src/sys/arch/i386/stand/efiboot/bootx64/Makefile:1.6
--- src/sys/arch/i386/stand/efiboot/bootx64/Makefile:1.5 Sat Jun 3 08:52:56 2023
+++ src/sys/arch/i386/stand/efiboot/bootx64/Makefile Sat Jun 3 21:26:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/03 08:52:56 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 21:26:28 lukem Exp $
PROG= bootx64.efi
OBJFMT= pei-x86-64
@@ -12,7 +12,6 @@ CPPFLAGS+= -DEFI_FUNCTION_WRAPPER
# Follow the suit of Makefile.kern.inc; needed for the lfs64 union
# 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+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include "${.CURDIR}/../Makefile.efiboot"
Index: src/sys/arch/macppc/stand/Makefile.inc
diff -u src/sys/arch/macppc/stand/Makefile.inc:1.8 src/sys/arch/macppc/stand/Makefile.inc:1.9
--- src/sys/arch/macppc/stand/Makefile.inc:1.8 Sat Jun 3 08:52:57 2023
+++ src/sys/arch/macppc/stand/Makefile.inc Sat Jun 3 21:26:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2023/06/03 08:52:57 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.9 2023/06/03 21:26:28 lukem Exp $
BINDIR= /usr/mdec
@@ -10,5 +10,4 @@ LINKFLAGS_UNWIND= --no-ld-generated-unwi
# Follow the suit of Makefile.kern.inc; needed for the lfs64 union
# 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+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
Index: src/sys/arch/sparc/stand/boot/Makefile
diff -u src/sys/arch/sparc/stand/boot/Makefile:1.45 src/sys/arch/sparc/stand/boot/Makefile:1.46
--- src/sys/arch/sparc/stand/boot/Makefile:1.45 Sat Jun 3 08:52:57 2023
+++ src/sys/arch/sparc/stand/boot/Makefile Sat Jun 3 21:26:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2023/06/03 08:52:57 lukem Exp $
+# $NetBSD: Makefile,v 1.46 2023/06/03 21:26:28 lukem Exp $
STRIPFLAG=
PROGSOURCE= boot.c net.c netif_sun.c conf.c openfirm.c bootinfo.c \
@@ -17,8 +17,7 @@ SAMISCMAKEFLAGS= SA_USE_CREAD=yes
# Follow the suit of Makefile.kern.inc; needed for the lfs64 union
# 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+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${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.20 src/sys/arch/sparc/stand/bootxx/Makefile:1.21
--- src/sys/arch/sparc/stand/bootxx/Makefile:1.20 Sat Jun 3 08:52:57 2023
+++ src/sys/arch/sparc/stand/bootxx/Makefile Sat Jun 3 21:26:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2023/06/03 08:52:57 lukem Exp $
+# $NetBSD: Makefile,v 1.21 2023/06/03 21:26:28 lukem Exp $
PROG= bootxx
PROGSOURCE= bootxx.c
@@ -13,8 +13,7 @@ CLEANFILES+= ${PROG}.sym
# Follow the suit of Makefile.kern.inc; needed for the lfs64 union
# 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+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${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.41 src/sys/arch/sparc/stand/ofwboot/Makefile:1.42
--- src/sys/arch/sparc/stand/ofwboot/Makefile:1.41 Sat Jun 3 08:52:57 2023
+++ src/sys/arch/sparc/stand/ofwboot/Makefile Sat Jun 3 21:26:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2023/06/03 08:52:57 lukem Exp $
+# $NetBSD: Makefile,v 1.42 2023/06/03 21:26:28 lukem Exp $
.include <bsd.init.mk>
@@ -41,8 +41,7 @@ CPPFLAGS+= -DSUPPORT_DHCP
# Follow the suit of Makefile.kern.inc; needed for the lfs64 union
# 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+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
LINKS+= ${BINDIR}/ofwboot ${BINDIR}/ofwboot.net
Index: src/sys/arch/zaurus/stand/Makefile.inc
diff -u src/sys/arch/zaurus/stand/Makefile.inc:1.9 src/sys/arch/zaurus/stand/Makefile.inc:1.10
--- src/sys/arch/zaurus/stand/Makefile.inc:1.9 Sat Jun 3 08:52:57 2023
+++ src/sys/arch/zaurus/stand/Makefile.inc Sat Jun 3 21:26:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2023/06/03 08:52:57 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.10 2023/06/03 21:26:28 lukem Exp $
BINDIR= /usr/mdec
KLINK_MACHINE= zaurus
@@ -6,5 +6,4 @@ KLINK_MACHINE= zaurus
# Follow the suit of Makefile.kern.inc; needed for the lfs64 union
# 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+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.296 src/sys/conf/Makefile.kern.inc:1.297
--- src/sys/conf/Makefile.kern.inc:1.296 Sat Jun 3 08:52:58 2023
+++ src/sys/conf/Makefile.kern.inc Sat Jun 3 21:26:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.296 2023/06/03 08:52:58 lukem Exp $
+# $NetBSD: Makefile.kern.inc,v 1.297 2023/06/03 21:26:29 lukem Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -95,9 +95,9 @@ CWARNFLAGS+= -Wold-style-definition
CWARNFLAGS+= -Wno-sign-compare
CWARNFLAGS.clang+= -Wno-unknown-pragmas -Wno-conversion \
- -Wno-self-assign -Wno-error=address-of-packed-member \
+ -Wno-self-assign \
-Wno-error=constant-conversion
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC} == "clang":? \
-Wno-shift-count-negative -Wno-shift-count-overflow:}
Index: src/sys/rump/fs/lib/libudf/Makefile
diff -u src/sys/rump/fs/lib/libudf/Makefile:1.12 src/sys/rump/fs/lib/libudf/Makefile:1.13
--- src/sys/rump/fs/lib/libudf/Makefile:1.12 Sat Jun 3 08:52:59 2023
+++ src/sys/rump/fs/lib/libudf/Makefile Sat Jun 3 21:26:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/06/03 08:52:59 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 21:26:29 lukem Exp $
#
.PATH: ${.CURDIR}/../../../../fs/udf
@@ -11,8 +11,8 @@ SRCS= udf_osta.c udf_vfsops.c udf_vnops.
udf_strat_direct.c udf_strat_sequential.c udf_strat_rmw.c \
udf_rename.c
-CWARNFLAGS.clang+= -Wno-self-assign -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS.clang+= -Wno-self-assign
+CWARNFLAGS+= ${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.9 src/sys/rump/net/lib/Makefile.inc:1.10
--- src/sys/rump/net/lib/Makefile.inc:1.9 Sat Jun 3 08:52:59 2023
+++ src/sys/rump/net/lib/Makefile.inc Sat Jun 3 21:26:29 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.9 2023/06/03 08:52:59 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.10 2023/06/03 21:26:29 lukem Exp $
#
RUMPTOP= ${.CURDIR}/../../..
-CWARNFLAGS.clang+= -Wno-error=address-of-packed-member -Werror=constant-conversion
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS.clang+= -Werror=constant-conversion
+CWARNFLAGS= ${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.27 src/sys/stand/efiboot/Makefile.efiboot:1.28
--- src/sys/stand/efiboot/Makefile.efiboot:1.27 Sat Jun 3 08:52:59 2023
+++ src/sys/stand/efiboot/Makefile.efiboot Sat Jun 3 21:26:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.efiboot,v 1.27 2023/06/03 08:52:59 lukem Exp $
+# $NetBSD: Makefile.efiboot,v 1.28 2023/06/03 21:26:29 lukem Exp $
S= ${.CURDIR}/../../..
@@ -106,8 +106,7 @@ CPPFLAGS+= -DDEFAULT_TIMEOUT=5
# Follow the suit of Makefile.kern.inc; needed for the lfs64 union
# 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+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
SAMISCCPPFLAGS+= -DLIBSA_PRINTF_LONGLONG_SUPPORT
SAMISCCPPFLAGS+= -DLIBSA_PRINTF_WIDTH_SUPPORT
Index: src/usr.sbin/fstyp/Makefile
diff -u src/usr.sbin/fstyp/Makefile:1.13 src/usr.sbin/fstyp/Makefile:1.14
--- src/usr.sbin/fstyp/Makefile:1.13 Sat Jun 3 08:53:00 2023
+++ src/usr.sbin/fstyp/Makefile Sat Jun 3 21:26:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/06/03 08:53:00 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2023/06/03 21:26:29 lukem Exp $
.include <bsd.own.mk>
@@ -31,7 +31,7 @@ CPPFLAGS.zfs.c+= -I${OSNET}/dist/uts/com
CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/libnvpair
.endif
-CWARNFLAGS.clang+= -Wno-unknown-pragmas -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS.clang+= -Wno-unknown-pragmas
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
Index: src/usr.sbin/installboot/Makefile
diff -u src/usr.sbin/installboot/Makefile:1.57 src/usr.sbin/installboot/Makefile:1.58
--- src/usr.sbin/installboot/Makefile:1.57 Sat Jun 3 08:53:00 2023
+++ src/usr.sbin/installboot/Makefile Sat Jun 3 21:26:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2023/06/03 08:53:00 lukem Exp $
+# $NetBSD: Makefile,v 1.58 2023/06/03 21:26:29 lukem Exp $
#
.include <bsd.own.mk>
@@ -87,7 +87,6 @@ LDADD+= -lutil
DPADD+= ${LIBUTIL}
.endif
-CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${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.7 src/usr.sbin/makefs/udf/Makefile.inc:1.8
--- src/usr.sbin/makefs/udf/Makefile.inc:1.7 Sat Jun 3 08:53:00 2023
+++ src/usr.sbin/makefs/udf/Makefile.inc Sat Jun 3 21:26:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2023/06/03 08:53:00 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.8 2023/06/03 21:26:29 lukem Exp $
#
UDF= ${NETBSDSRCDIR}/sys/fs/udf
@@ -16,5 +16,5 @@ DPADD+=${LIBUTIL}
LDADD+=-lutil -lprop
.endif
-CWARNFLAGS.clang+= -Wno-error=address-of-packed-member -Wno-error=constant-conversion
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS.clang+= -Wno-error=constant-conversion
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
Index: src/usr.sbin/pf/Makefile.inc
diff -u src/usr.sbin/pf/Makefile.inc:1.12 src/usr.sbin/pf/Makefile.inc:1.13
--- src/usr.sbin/pf/Makefile.inc:1.12 Sat Jun 3 08:53:01 2023
+++ src/usr.sbin/pf/Makefile.inc Sat Jun 3 21:26:29 2023
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.12 2023/06/03 08:53:01 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.13 2023/06/03 21:26:29 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+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
CPPFLAGS+= -D_OPENBSD_SOURCE
