From f937c412f371bc14cc109a4768482c4850abc7a5 Mon Sep 17 00:00:00 2001 From: lukem Date: Sat, 3 Jun 2023 08:52:53 +0000 Subject: [PATCH] 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. --- .../llvm/lib/libLLVMInstCombine/Makefile | 4 ++-- .../llvm/lib/libLLVMInstrumentation/Makefile | 4 ++-- .../mDNSResponder/usr.sbin/mdnsd/Makefile | 4 ++-- external/bsd/ipf/Makefile.inc | 4 ++-- external/bsd/ipf/bin/ipmon/Makefile | 4 ++-- external/bsd/ntp/bin/ntpd/Makefile | 4 ++-- external/bsd/tcpdump/bin/Makefile | 4 ++-- external/bsd/wpa/bin/hostapd/Makefile | 4 ++-- external/gpl3/gcc.old/README.warnings | 6 +++--- external/gpl3/gcc/README.warnings | 6 +++--- .../server/drivers/xf86-video-intel/Makefile | 4 ++-- .../server/drivers/xf86-video-vmware/Makefile | 4 ++-- lib/libc/net/Makefile.inc | 4 ++-- libexec/identd/Makefile | 4 ++-- sbin/dump/Makefile | 4 ++-- sbin/fsck_ffs/Makefile | 4 ++-- sbin/fsck_udf/Makefile | 4 ++-- sbin/fsck_v7fs/Makefile | 4 ++-- sbin/fsdb/Makefile | 4 ++-- sbin/newfs/Makefile | 4 ++-- sbin/newfs_udf/Makefile | 4 ++-- sbin/newfs_v7fs/Makefile | 4 ++-- sbin/nvmectl/Makefile | 4 ++-- share/mk/bsd.kmodule.mk | 4 ++-- share/mk/bsd.own.mk | 17 +++++------------ sys/arch/bebox/stand/boot/Makefile | 4 ++-- sys/arch/i386/stand/Makefile.booters | 4 ++-- sys/arch/i386/stand/boot/Makefile.boot | 4 ++-- sys/arch/i386/stand/bootxx/Makefile.bootxx | 4 ++-- sys/arch/i386/stand/efiboot/Makefile.efiboot | 4 ++-- sys/arch/i386/stand/efiboot/bootx64/Makefile | 4 ++-- sys/arch/i386/stand/lib/Makefile | 4 ++-- sys/arch/macppc/stand/Makefile.inc | 4 ++-- sys/arch/mipsco/stand/installboot/Makefile | 4 ++-- sys/arch/prep/stand/boot/Makefile | 4 ++-- sys/arch/sparc/stand/boot/Makefile | 4 ++-- sys/arch/sparc/stand/bootxx/Makefile | 4 ++-- sys/arch/sparc/stand/ofwboot/Makefile | 4 ++-- sys/arch/sun3/conf/Makefile.sun3 | 4 ++-- sys/arch/zaurus/stand/Makefile.inc | 4 ++-- sys/conf/Makefile.kern.inc | 4 ++-- sys/conf/copts.mk | 6 +++--- sys/modules/ffs/Makefile | 4 ++-- sys/modules/ipl/Makefile | 16 ++++++++-------- sys/modules/npf/Makefile | 4 ++-- sys/modules/pf/Makefile | 8 ++++---- sys/modules/slcompress/Makefile | 4 ++-- sys/modules/udf/Makefile | 6 +++--- sys/modules/v7fs/Makefile | 4 ++-- sys/rump/fs/lib/libffs/Makefile | 4 ++-- sys/rump/fs/lib/libmsdos/Makefile | 4 ++-- sys/rump/fs/lib/libudf/Makefile | 4 ++-- sys/rump/fs/lib/libv7fs/Makefile | 4 ++-- sys/rump/fs/lib/libzfs/Makefile | 4 ++-- sys/rump/net/lib/Makefile.inc | 4 ++-- sys/stand/efiboot/Makefile.efiboot | 4 ++-- tests/lib/libc/sys/Makefile | 4 ++-- usr.bin/kdump/Makefile | 4 ++-- usr.bin/ktruss/Makefile | 4 ++-- usr.sbin/bootp/common/Makefile | 4 ++-- usr.sbin/fstyp/Makefile | 4 ++-- usr.sbin/installboot/Makefile | 4 ++-- usr.sbin/makefs/udf/Makefile.inc | 4 ++-- usr.sbin/map-mbone/Makefile | 4 ++-- usr.sbin/mrinfo/Makefile | 4 ++-- usr.sbin/mrouted/Makefile | 4 ++-- usr.sbin/mtrace/Makefile | 4 ++-- usr.sbin/ndbootd/Makefile | 4 ++-- usr.sbin/pf/Makefile.inc | 4 ++-- usr.sbin/racoon/Makefile | 4 ++-- 70 files changed, 155 insertions(+), 162 deletions(-) diff --git a/external/apache2/llvm/lib/libLLVMInstCombine/Makefile b/external/apache2/llvm/lib/libLLVMInstCombine/Makefile index 4e87346d2796..b951a689ab80 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 .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 fb561c1d722a..2009f34950db 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 .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 9a6a027a2543..e131bc8b16b4 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 7f337228b0bc..4cbeea00c517 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 diff --git a/external/bsd/ipf/bin/ipmon/Makefile b/external/bsd/ipf/bin/ipmon/Makefile index 96c32ac4f561..b1fe88e03ac9 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 diff --git a/external/bsd/ntp/bin/ntpd/Makefile b/external/bsd/ntp/bin/ntpd/Makefile index 597730045de0..15e08f2ec040 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 @@ -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 7b9e3ea0ae9f..30eb0bfa8304 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 2d7f1293918c..4decdc35159a 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 7256380a0a95..14e8952cabfc 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 619bf35540c5..a6f4f35fc1ca 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 54bab6b7a3a3..af7ece342e3c 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 @@ -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 0bb9607047ba..2ecd86ed59ed 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} diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc index aee7e43cfc6d..b507b9eef866 100644 --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -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_freepaddrs.3 sctp_getaddrlen.3 \ 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} diff --git a/libexec/identd/Makefile b/libexec/identd/Makefile index 5012801d7ca8..b347e3627697 100644 --- a/libexec/identd/Makefile +++ b/libexec/identd/Makefile @@ -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 @@ -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 diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile index 6933a1345a13..897ccfbe2551 100644 --- a/sbin/dump/Makefile +++ b/sbin/dump/Makefile @@ -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 diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile index e8dd9e4b3060..d40989f1e7bf 100644 --- a/sbin/fsck_ffs/Makefile +++ b/sbin/fsck_ffs/Makefile @@ -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 .include diff --git a/sbin/fsck_udf/Makefile b/sbin/fsck_udf/Makefile index 19f3c6bd1613..4470fa1f40a2 100644 --- a/sbin/fsck_udf/Makefile +++ b/sbin/fsck_udf/Makefile @@ -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 @@ -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 diff --git a/sbin/fsck_v7fs/Makefile b/sbin/fsck_v7fs/Makefile index 5796a9ee41ff..7bf33c1d6725 100644 --- a/sbin/fsck_v7fs/Makefile +++ b/sbin/fsck_v7fs/Makefile @@ -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 @@ -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 diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile index e63ea805840d..c039f73a1ebe 100644 --- a/sbin/fsdb/Makefile +++ b/sbin/fsdb/Makefile @@ -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 @@ -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 diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile index 0a8ba331b67d..56fd4df29172 100644 --- a/sbin/newfs/Makefile +++ b/sbin/newfs/Makefile @@ -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 diff --git a/sbin/newfs_udf/Makefile b/sbin/newfs_udf/Makefile index 1ca327586b90..66ed06c1a60d 100644 --- a/sbin/newfs_udf/Makefile +++ b/sbin/newfs_udf/Makefile @@ -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 @@ -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 diff --git a/sbin/newfs_v7fs/Makefile b/sbin/newfs_v7fs/Makefile index 6af8d9a3c957..6d67950332eb 100644 --- a/sbin/newfs_v7fs/Makefile +++ b/sbin/newfs_v7fs/Makefile @@ -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 @@ -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 diff --git a/sbin/nvmectl/Makefile b/sbin/nvmectl/Makefile index b03d4227a17a..6227f400f67f 100644 --- a/sbin/nvmectl/Makefile +++ b/sbin/nvmectl/Makefile @@ -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 @@ -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 diff --git a/share/mk/bsd.kmodule.mk b/share/mk/bsd.kmodule.mk index f8940b984af5..6d8d8f153f32 100644 --- a/share/mk/bsd.kmodule.mk +++ b/share/mk/bsd.kmodule.mk @@ -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-conversion 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 diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 90cf1258de7b..844647de2f5e 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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" && ${HAVE_GCC:U0} >= 7:? -Wno- 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. diff --git a/sys/arch/bebox/stand/boot/Makefile b/sys/arch/bebox/stand/boot/Makefile index 2c2584c75a83..e751f87b6dfb 100644 --- a/sys/arch/bebox/stand/boot/Makefile +++ b/sys/arch/bebox/stand/boot/Makefile @@ -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 .include diff --git a/sys/arch/i386/stand/Makefile.booters b/sys/arch/i386/stand/Makefile.booters index e6fdcbdd42e3..647a59a90dc9 100644 --- a/sys/arch/i386/stand/Makefile.booters +++ b/sys/arch/i386/stand/Makefile.booters @@ -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} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBI386} ${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 KLINK_MACHINE= i386 diff --git a/sys/arch/i386/stand/boot/Makefile.boot b/sys/arch/i386/stand/boot/Makefile.boot index a02cc1f5b77c..5a7d1b3d8fb4 100644 --- a/sys/arch/i386/stand/boot/Makefile.boot +++ b/sys/arch/i386/stand/boot/Makefile.boot @@ -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} ${.CURDIR}/../Makefile.boot -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 KLINK_MACHINE= i386 diff --git a/sys/arch/i386/stand/bootxx/Makefile.bootxx b/sys/arch/i386/stand/bootxx/Makefile.bootxx index ed32f65b9b6d..2be55256c2f3 100644 --- a/sys/arch/i386/stand/bootxx/Makefile.bootxx +++ b/sys/arch/i386/stand/bootxx/Makefile.bootxx @@ -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 KLINK_MACHINE= i386 diff --git a/sys/arch/i386/stand/efiboot/Makefile.efiboot b/sys/arch/i386/stand/efiboot/Makefile.efiboot index 63db513f9cb4..3d4c73be403c 100644 --- a/sys/arch/i386/stand/efiboot/Makefile.efiboot +++ b/sys/arch/i386/stand/efiboot/Makefile.efiboot @@ -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} ${LDSCRIPT} ${.CURDIR}/../Makefile.efiboot 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 diff --git a/sys/arch/i386/stand/efiboot/bootx64/Makefile b/sys/arch/i386/stand/efiboot/bootx64/Makefile index 0395ac3e172a..622d52406dfe 100644 --- a/sys/arch/i386/stand/efiboot/bootx64/Makefile +++ b/sys/arch/i386/stand/efiboot/bootx64/Makefile @@ -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" diff --git a/sys/arch/i386/stand/lib/Makefile b/sys/arch/i386/stand/lib/Makefile index 6ea672c7c007..1791808ef9f2 100644 --- a/sys/arch/i386/stand/lib/Makefile +++ b/sys/arch/i386/stand/lib/Makefile @@ -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 dump_eax.S pvcopy.S putstr.S putstr32.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 diff --git a/sys/arch/macppc/stand/Makefile.inc b/sys/arch/macppc/stand/Makefile.inc index d20b2a025455..2ad84ba29909 100644 --- a/sys/arch/macppc/stand/Makefile.inc +++ b/sys/arch/macppc/stand/Makefile.inc @@ -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-unwind-info # 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} diff --git a/sys/arch/mipsco/stand/installboot/Makefile b/sys/arch/mipsco/stand/installboot/Makefile index 4816ad6f34b7..3934c8281307 100644 --- a/sys/arch/mipsco/stand/installboot/Makefile +++ b/sys/arch/mipsco/stand/installboot/Makefile @@ -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 diff --git a/sys/arch/prep/stand/boot/Makefile b/sys/arch/prep/stand/boot/Makefile index 33ab0eb46cd3..d50da3bbb8eb 100644 --- a/sys/arch/prep/stand/boot/Makefile +++ b/sys/arch/prep/stand/boot/Makefile @@ -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 .include diff --git a/sys/arch/sparc/stand/boot/Makefile b/sys/arch/sparc/stand/boot/Makefile index 80f94e12d8fa..13b883af12ad 100644 --- a/sys/arch/sparc/stand/boot/Makefile +++ b/sys/arch/sparc/stand/boot/Makefile @@ -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" diff --git a/sys/arch/sparc/stand/bootxx/Makefile b/sys/arch/sparc/stand/bootxx/Makefile index 4bf8f4234a4e..6c2c674b1242 100644 --- a/sys/arch/sparc/stand/bootxx/Makefile +++ b/sys/arch/sparc/stand/bootxx/Makefile @@ -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= diff --git a/sys/arch/sparc/stand/ofwboot/Makefile b/sys/arch/sparc/stand/ofwboot/Makefile index 19bde86e6733..f6707263e40f 100644 --- a/sys/arch/sparc/stand/ofwboot/Makefile +++ b/sys/arch/sparc/stand/ofwboot/Makefile @@ -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 @@ -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 diff --git a/sys/arch/sun3/conf/Makefile.sun3 b/sys/arch/sun3/conf/Makefile.sun3 index c1c52cd2de85..966a17d1c77e 100644 --- a/sys/arch/sun3/conf/Makefile.sun3 +++ b/sys/arch/sun3/conf/Makefile.sun3 @@ -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 diff --git a/sys/arch/zaurus/stand/Makefile.inc b/sys/arch/zaurus/stand/Makefile.inc index d9129b499417..2c625688f7d3 100644 --- a/sys/arch/zaurus/stand/Makefile.inc +++ b/sys/arch/zaurus/stand/Makefile.inc @@ -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} diff --git a/sys/conf/Makefile.kern.inc b/sys/conf/Makefile.kern.inc index e8272cf960c4..bbbcfb4ef39d 100644 --- a/sys/conf/Makefile.kern.inc +++ b/sys/conf/Makefile.kern.inc @@ -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:} diff --git a/sys/conf/copts.mk b/sys/conf/copts.mk index 6e06b7703263..4035152afda9 100644 --- a/sys/conf/copts.mk +++ b/sys/conf/copts.mk @@ -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=unused-but-set-variable .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} diff --git a/sys/modules/ffs/Makefile b/sys/modules/ffs/Makefile index 3aa8eaae6498..905a66570301 100644 --- a/sys/modules/ffs/Makefile +++ b/sys/modules/ffs/Makefile @@ -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 -DQUOTA -DQUOTA2 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 \ diff --git a/sys/modules/ipl/Makefile b/sys/modules/ipl/Makefile index a1ab0b07d246..ab371820c912 100644 --- a/sys/modules/ipl/Makefile +++ b/sys/modules/ipl/Makefile @@ -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 diff --git a/sys/modules/npf/Makefile b/sys/modules/npf/Makefile index bcd6eaee8c7e..f2a4085cb2d2 100644 --- a/sys/modules/npf/Makefile +++ b/sys/modules/npf/Makefile @@ -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.c dnvlist.c 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 diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile index 6566d3a5a250..892b991279ca 100644 --- a/sys/modules/pf/Makefile +++ b/sys/modules/pf/Makefile @@ -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 diff --git a/sys/modules/slcompress/Makefile b/sys/modules/slcompress/Makefile index 51d737b944ff..75cf32eddf4f 100644 --- a/sys/modules/slcompress/Makefile +++ b/sys/modules/slcompress/Makefile @@ -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 diff --git a/sys/modules/udf/Makefile b/sys/modules/udf/Makefile index 223d73e95707..0dd65860881f 100644 --- a/sys/modules/udf/Makefile +++ b/sys/modules/udf/Makefile @@ -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 diff --git a/sys/modules/v7fs/Makefile b/sys/modules/v7fs/Makefile index 25979b033ecd..500be65c98f9 100644 --- a/sys/modules/v7fs/Makefile +++ b/sys/modules/v7fs/Makefile @@ -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 diff --git a/sys/rump/fs/lib/libffs/Makefile b/sys/rump/fs/lib/libffs/Makefile index 80de926b31e5..19c786576ae3 100644 --- a/sys/rump/fs/lib/libffs/Makefile +++ b/sys/rump/fs/lib/libffs/Makefile @@ -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.c ufs_extattr.c ufs_inode.c \ 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 diff --git a/sys/rump/fs/lib/libmsdos/Makefile b/sys/rump/fs/lib/libmsdos/Makefile index f41e05fe9cdf..686d50c6b96e 100644 --- a/sys/rump/fs/lib/libmsdos/Makefile +++ b/sys/rump/fs/lib/libmsdos/Makefile @@ -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 .include diff --git a/sys/rump/fs/lib/libudf/Makefile b/sys/rump/fs/lib/libudf/Makefile index 06e793ea5fd8..2642bf3a11b6 100644 --- a/sys/rump/fs/lib/libudf/Makefile +++ b/sys/rump/fs/lib/libudf/Makefile @@ -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.c udf_subr.c \ 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 .include diff --git a/sys/rump/fs/lib/libv7fs/Makefile b/sys/rump/fs/lib/libv7fs/Makefile index 294ff63213ce..f6107ac3f829 100644 --- a/sys/rump/fs/lib/libv7fs/Makefile +++ b/sys/rump/fs/lib/libv7fs/Makefile @@ -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_vnops.c v7fs_vfsops.c CPPFLAGS+= -DV7FS_EI -CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER} +CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER} .include .include diff --git a/sys/rump/fs/lib/libzfs/Makefile b/sys/rump/fs/lib/libzfs/Makefile index 3a5ca32fff98..df6644cc038e 100644 --- a/sys/rump/fs/lib/libzfs/Makefile +++ b/sys/rump/fs/lib/libzfs/Makefile @@ -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 .include diff --git a/sys/rump/net/lib/Makefile.inc b/sys/rump/net/lib/Makefile.inc index d0c7e9da7884..31b4eb65c9f3 100644 --- a/sys/rump/net/lib/Makefile.inc +++ b/sys/rump/net/lib/Makefile.inc @@ -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" diff --git a/sys/stand/efiboot/Makefile.efiboot b/sys/stand/efiboot/Makefile.efiboot index b217176bdaab..ce451fd09bee 100644 --- a/sys/stand/efiboot/Makefile.efiboot +++ b/sys/stand/efiboot/Makefile.efiboot @@ -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 diff --git a/tests/lib/libc/sys/Makefile b/tests/lib/libc/sys/Makefile index e423f66c730a..181026a01b99 100644 --- a/tests/lib/libc/sys/Makefile +++ b/tests/lib/libc/sys/Makefile @@ -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 diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index e06d6c53676a..f7c099ab6ee7 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -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 # for MKDYNAMICROOT & NETBSDSRCDIR @@ -25,6 +25,6 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys -D_KERNTYPES LDADD+=-lutil DPADD+=${LIBUTIL} -CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER} +CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER} .include diff --git a/usr.bin/ktruss/Makefile b/usr.bin/ktruss/Makefile index 087637d44e63..fcdcded15e4c 100644 --- a/usr.bin/ktruss/Makefile +++ b/usr.bin/ktruss/Makefile @@ -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/sys/errno.h makeerrnos.sh \ 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 diff --git a/usr.sbin/bootp/common/Makefile b/usr.sbin/bootp/common/Makefile index a44f39836b38..9b12e6a84061 100644 --- a/usr.sbin/bootp/common/Makefile +++ b/usr.sbin/bootp/common/Makefile @@ -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 hwaddr.c lookup.c readfile.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 diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile index 27482d2ee470..9adb10b00fc9 100644 --- a/usr.sbin/fstyp/Makefile +++ b/usr.sbin/fstyp/Makefile @@ -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 @@ -32,6 +32,6 @@ CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/libnvpair .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 diff --git a/usr.sbin/installboot/Makefile b/usr.sbin/installboot/Makefile index fc6a5dcfa45f..da996811b0ae 100644 --- a/usr.sbin/installboot/Makefile +++ b/usr.sbin/installboot/Makefile @@ -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 @@ -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 diff --git a/usr.sbin/makefs/udf/Makefile.inc b/usr.sbin/makefs/udf/Makefile.inc index ca726869190d..ac0dd2630292 100644 --- a/usr.sbin/makefs/udf/Makefile.inc +++ b/usr.sbin/makefs/udf/Makefile.inc @@ -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} diff --git a/usr.sbin/map-mbone/Makefile b/usr.sbin/map-mbone/Makefile index 9bfbd15c6da0..3136c552c38b 100644 --- a/usr.sbin/map-mbone/Makefile +++ b/usr.sbin/map-mbone/Makefile @@ -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 @@ -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 diff --git a/usr.sbin/mrinfo/Makefile b/usr.sbin/mrinfo/Makefile index caff306a8efc..5e9b5c5f3c2f 100644 --- a/usr.sbin/mrinfo/Makefile +++ b/usr.sbin/mrinfo/Makefile @@ -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 @@ -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 diff --git a/usr.sbin/mrouted/Makefile b/usr.sbin/mrouted/Makefile index 8a37ecf834df..5b9276730f9c 100644 --- a/usr.sbin/mrouted/Makefile +++ b/usr.sbin/mrouted/Makefile @@ -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 @@ -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} diff --git a/usr.sbin/mtrace/Makefile b/usr.sbin/mtrace/Makefile index 13d726d122a0..aef09db6198b 100644 --- a/usr.sbin/mtrace/Makefile +++ b/usr.sbin/mtrace/Makefile @@ -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 @@ -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 diff --git a/usr.sbin/ndbootd/Makefile b/usr.sbin/ndbootd/Makefile index e25aba92e27d..8d34e3cc54c7 100644 --- a/usr.sbin/ndbootd/Makefile +++ b/usr.sbin/ndbootd/Makefile @@ -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-tree-lrs .endif CWARNFLAGS.clang+= -Wno-tautological-compare -CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER} +CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER} .include .include diff --git a/usr.sbin/pf/Makefile.inc b/usr.sbin/pf/Makefile.inc index 03672330d1e2..b3d14a4ee469 100644 --- a/usr.sbin/pf/Makefile.inc +++ b/usr.sbin/pf/Makefile.inc @@ -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 diff --git a/usr.sbin/racoon/Makefile b/usr.sbin/racoon/Makefile index 84e51fccc5fb..39841926c845 100644 --- a/usr.sbin/racoon/Makefile +++ b/usr.sbin/racoon/Makefile @@ -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.l 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