[PATCH] x86: Use -mindirect-branch-cs-prefix for RETPOLINE builds

From: Peter Zijlstra
Date: Thu Nov 18 2021 - 13:54:36 EST



In order to further enable commit:

bbe2df3f6b6d ("x86/alternative: Try inline spectre_v2=retpoline,amd")

add the new GCC flag -mindirect-branch-cs-prefix:

https://gcc.gnu.org/g:2196a681d7810ad8b227bf983f38ba716620545e

to RETPOLINE=y builds. This should allow fully inlining retpoline,amd
for GCC builds.

Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
---
Makefile | 1 +
1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 9e12c14ea0fb..5fd5b5f091ae 100644
--- a/Makefile
+++ b/Makefile
@@ -690,6 +690,7 @@ endif

ifdef CONFIG_CC_IS_GCC
RETPOLINE_CFLAGS := $(call cc-option,-mindirect-branch=thunk-extern -mindirect-branch-register)
+RETPOLINE_CFLAGS += $(call cc-option,-mindirect-branch-cs-prefix)
RETPOLINE_VDSO_CFLAGS := $(call cc-option,-mindirect-branch=thunk-inline -mindirect-branch-register)
endif
ifdef CONFIG_CC_IS_CLANG