Commit 132305b3 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: stop filtering out $(GCC_PLUGINS_CFLAGS) from cc-option base 



Commit d26e9414 ("kbuild: no gcc-plugins during cc-option tests")
was neeeded because scripts/Makefile.gcc-plugins was too early.

This is unneeded by including scripts/Makefile.gcc-plugins last,
and being careful to not add cc-option tests after it.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent e0fe0bbe

Makefile

+4 −1
Original line number Diff line number Diff line
@@ -506,7 +506,6 @@ KBUILD_CFLAGS_MODULE := -DMODULE 
KBUILD_LDFLAGS_MODULE :=

export KBUILD_LDS_MODULE := $(srctree)/scripts/module-common.lds

KBUILD_LDFLAGS :=

GCC_PLUGINS_CFLAGS :=

CLANG_FLAGS :=



export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC
@@ -955,6 +954,10 @@ include-$(CONFIG_GCC_PLUGINS) += scripts/Makefile.gcc-plugins 


include $(addprefix $(srctree)/, $(include-y))



# scripts/Makefile.gcc-plugins is intentionally included last.

# Do not add $(call cc-option,...) below this line. When you build the kernel

# from the clean source tree, the GCC plugins do not exist at this point.



# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments

KBUILD_CPPFLAGS += $(KCPPFLAGS)

KBUILD_AFLAGS   += $(KAFLAGS)

scripts/Kbuild.include

+3 −7
Original line number Diff line number Diff line
@@ -119,25 +119,21 @@ as-instr = $(call try-run,\ 
__cc-option = $(call try-run,\

	$(1) -Werror $(2) $(3) -c -x c /dev/null -o "$$TMP",$(3),$(4))



# Do not attempt to build with gcc plugins during cc-option tests.

# (And this uses delayed resolution so the flags will be up to date.)

CC_OPTION_CFLAGS = $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))



# cc-option

# Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)



cc-option = $(call __cc-option, $(CC),\

	$(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS),$(1),$(2))

	$(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS),$(1),$(2))



# cc-option-yn

# Usage: flag := $(call cc-option-yn,-march=winchip-c6)

cc-option-yn = $(call try-run,\

	$(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)

	$(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)



# cc-disable-warning

# Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)

cc-disable-warning = $(call try-run,\

	$(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))

	$(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))



# cc-ifversion

# Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE