From abaa8cb87058c08ad0688c849a28f4e007c07bbb Mon Sep 17 00:00:00 2001 From: lukem Date: Sat, 3 Jun 2023 08:52:53 +0000 Subject: 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. --- 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 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'sys/modules') diff --git a/sys/modules/ffs/Makefile b/sys/modules/ffs/Makefile index 3aa8eaae649..905a6657030 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 a1ab0b07d24..ab371820c91 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 bcd6eaee8c7..f2a4085cb2d 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 6566d3a5a25..892b991279c 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 51d737b944f..75cf32eddf4 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 223d73e9570..0dd65860881 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 25979b033ec..500be65c98f 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 -- cgit