Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 669e06b1 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: move RETPOLINE flags below config-targets 



When you run a "make *config" target, the retpoline compiler flags
are evaluated for nothing because the code is located above the
'ifeq ($(config-targets),1)'.

Move it a bit below to avoid unneeded computation in the Kconfig stage.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 79a3aaa7

Makefile

+9 −9
Original line number Diff line number Diff line
@@ -519,15 +519,6 @@ KBUILD_AFLAGS += $(CLANG_FLAGS) 
export CLANG_FLAGS

endif



RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register

RETPOLINE_VDSO_CFLAGS_GCC := -mindirect-branch=thunk-inline -mindirect-branch-register

RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk

RETPOLINE_VDSO_CFLAGS_CLANG := -mretpoline

RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))

RETPOLINE_VDSO_CFLAGS := $(call cc-option,$(RETPOLINE_VDSO_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_VDSO_CFLAGS_CLANG)))

export RETPOLINE_CFLAGS

export RETPOLINE_VDSO_CFLAGS



# The expansion should be delayed until arch/$(SRCARCH)/Makefile is included.

# Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.

# CC_VERSION_TEXT is referenced from Kconfig (so it needs export),
@@ -624,6 +615,15 @@ ifdef CONFIG_FUNCTION_TRACER 
  CC_FLAGS_FTRACE := -pg

endif



RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register

RETPOLINE_VDSO_CFLAGS_GCC := -mindirect-branch=thunk-inline -mindirect-branch-register

RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk

RETPOLINE_VDSO_CFLAGS_CLANG := -mretpoline

RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))

RETPOLINE_VDSO_CFLAGS := $(call cc-option,$(RETPOLINE_VDSO_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_VDSO_CFLAGS_CLANG)))

export RETPOLINE_CFLAGS

export RETPOLINE_VDSO_CFLAGS



# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default

# values of the respective KBUILD_* variables

ARCH_CPPFLAGS :=