diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | arch/x86/Makefile | 5 |
2 files changed, 5 insertions, 5 deletions
@@ -487,11 +487,6 @@ KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) endif -RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register -RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk -RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG))) -export RETPOLINE_CFLAGS - ifeq ($(config-targets),1) # =========================================================================== # *config targets only - make sure prerequisites are updated, and descend diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 1c4d012550ec..33aab24c7b2c 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -239,6 +239,11 @@ KBUILD_CFLAGS += -Wno-sign-compare # KBUILD_CFLAGS += -fno-asynchronous-unwind-tables +RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register +RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk +RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG))) +export RETPOLINE_CFLAGS + # Avoid indirect branches in kernel to deal with Spectre ifdef CONFIG_RETPOLINE ifneq ($(RETPOLINE_CFLAGS),) |