diff options
| author | Christoph Muellner <christoph.muellner@theobroma-systems.com> | 2018-03-20 11:11:57 +0100 |
|---|---|---|
| committer | Christoph Muellner <christoph.muellner@theobroma-systems.com> | 2018-04-27 08:28:29 +0200 |
| commit | 5a0f312409eab96928a95598d440cf54b5cf7153 (patch) | |
| tree | bc60c42c74c87a12b3f091a1c0369fe8d48e5f42 | |
| parent | 15864540ddbda53071c5a85efaeccbee159836da (diff) | |
x86: Move x86-retpoline CFLAGS into x86 Makefile.
This patch moves the definition of RETPOLINE_CFLAGS*
into the arch specific Makefile to allow other architectures
to define their own retpoline CFLAGS.
Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | arch/x86/Makefile | 5 |
2 files changed, 5 insertions, 5 deletions
@@ -491,11 +491,6 @@ KBUILD_CFLAGS += $(call cc-option, -no-integrated-as) KBUILD_AFLAGS += $(call cc-option, -no-integrated-as) 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),) |