Globally enable -fms-extensions when building kernel with gcc, and remove
this option from all modules that enable it theirselves. In C mode -fms-extensions option enables anonymous structs and unions, allowing us to use this C11 feature in kernel. Of course, clang supports it without any extra options. Reviewed by: dim
This commit is contained in:
parent
b153f37ffc
commit
cc4a90c445
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=278913
@ -1141,7 +1141,7 @@ dev/cxgb/sys/uipc_mvec.c optional cxgb pci \
|
||||
dev/cxgb/cxgb_t3fw.c optional cxgb cxgb_t3fw \
|
||||
compile-with "${NORMAL_C} -I$S/dev/cxgb"
|
||||
dev/cxgbe/t4_mp_ring.c optional cxgbe pci \
|
||||
compile-with "${NORMAL_C} -I$S/dev/cxgbe ${GCC_MS_EXTENSIONS}"
|
||||
compile-with "${NORMAL_C} -I$S/dev/cxgbe"
|
||||
dev/cxgbe/t4_main.c optional cxgbe pci \
|
||||
compile-with "${NORMAL_C} -I$S/dev/cxgbe"
|
||||
dev/cxgbe/t4_netmap.c optional cxgbe pci \
|
||||
|
@ -39,7 +39,6 @@ CLANG_NO_IAS34= -no-integrated-as
|
||||
.endif
|
||||
|
||||
.if ${COMPILER_TYPE} == "gcc"
|
||||
GCC_MS_EXTENSIONS= -fms-extensions
|
||||
.if ${COMPILER_VERSION} >= 40300
|
||||
# Catch-all for all the things that are in our tree, but for which we're
|
||||
# not yet ready for this compiler. Note: we likely only really "support"
|
||||
|
@ -97,7 +97,7 @@ CFLAGS_PARAM_LARGE_FUNCTION_GROWTH?=1000
|
||||
.if ${MACHINE_CPUARCH} == "mips"
|
||||
CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=1000
|
||||
.endif
|
||||
CFLAGS.gcc+= -fno-common -finline-limit=${INLINE_LIMIT}
|
||||
CFLAGS.gcc+= -fno-common -fms-extensions -finline-limit=${INLINE_LIMIT}
|
||||
CFLAGS.gcc+= --param inline-unit-growth=${CFLAGS_PARAM_INLINE_UNIT_GROWTH}
|
||||
CFLAGS.gcc+= --param large-function-growth=${CFLAGS_PARAM_LARGE_FUNCTION_GROWTH}
|
||||
.if defined(CFLAGS_ARCH_PARAMS)
|
||||
@ -162,7 +162,7 @@ NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
|
||||
# Infiniband C flags. Correct include paths and omit errors that linux
|
||||
# does not honor.
|
||||
OFEDINCLUDES= -I$S/ofed/include/
|
||||
OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
|
||||
OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith
|
||||
OFEDCFLAGS= ${CFLAGS:N-I*} ${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR}
|
||||
OFED_C_NOIMP= ${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR} ${PROF}
|
||||
OFED_C= ${OFED_C_NOIMP} ${.IMPSRC}
|
||||
|
@ -105,6 +105,7 @@ CFLAGS+= -I. -I${SYSDIR}
|
||||
CFLAGS+= -I${SYSDIR}/contrib/altq
|
||||
|
||||
CFLAGS.gcc+= -finline-limit=${INLINE_LIMIT}
|
||||
CFLAGS.gcc+= -fms-extensions
|
||||
CFLAGS.gcc+= --param inline-unit-growth=100
|
||||
CFLAGS.gcc+= --param large-function-growth=1000
|
||||
|
||||
|
@ -26,4 +26,3 @@ SRCS+= t4_tracer.c
|
||||
CFLAGS+= -I${CXGBE}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
CFLAGS+= ${GCC_MS_EXTENSIONS}
|
||||
|
@ -106,6 +106,6 @@ SRCS += \
|
||||
iicbus_if.h \
|
||||
pci_if.h
|
||||
|
||||
CFLAGS += -I${.CURDIR}/../../../dev/drm2/radeon ${GCC_MS_EXTENSIONS}
|
||||
CFLAGS += -I${.CURDIR}/../../../dev/drm2/radeon
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -18,6 +18,6 @@ CFLAGS+= -DINET6 -DINET
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith
|
||||
|
||||
CWARNFLAGS.cm.c= -Wno-unused-function
|
||||
|
@ -15,4 +15,4 @@ CFLAGS+= -DINET6 -DINET
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith
|
||||
|
@ -15,7 +15,6 @@ CFLAGS+= -I${.CURDIR}/../../ofed/include/
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
|
||||
CFLAGS+= -fms-extensions
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith
|
||||
|
||||
CWARNFLAGS.mcg.c= -Wno-unused
|
||||
|
@ -13,8 +13,7 @@ CFLAGS+= -I${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4
|
||||
CFLAGS+= -I${.CURDIR}/../../ofed/include/
|
||||
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
|
||||
CFLAGS+= -DINET6 -DINET
|
||||
CFLAGS+= -fms-extensions
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith
|
||||
|
@ -8,8 +8,7 @@ SRCS += en_rx.c en_tx.c utils.c
|
||||
SRCS += opt_inet.h opt_inet6.h
|
||||
CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4
|
||||
CFLAGS+= -I${.CURDIR}/../../ofed/include/
|
||||
CFLAGS+= -fms-extensions
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith
|
||||
|
@ -14,4 +14,4 @@ CFLAGS+= -I${.CURDIR}/../../ofed/include
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith
|
||||
|
@ -30,4 +30,4 @@ opt_inet6.h:
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
|
||||
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith
|
||||
|
Loading…
Reference in New Issue
Block a user