Skip to content

Commit b4296a7

Browse files
Peter Zijlstragregkh
authored andcommitted
x86: Use -mindirect-branch-cs-prefix for RETPOLINE builds
commit 68cf4f2 upstream. In order to further enable commit: bbe2df3 ("x86/alternative: Try inline spectre_v2=retpoline,amd") add the new GCC flag -mindirect-branch-cs-prefix: https://gcc.gnu.org/g:2196a681d7810ad8b227bf983f38ba716620545e https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102952 https://bugs.llvm.org/show_bug.cgi?id=52323 to RETPOLINE=y builds. This should allow fully inlining retpoline,amd for GCC builds. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Kees Cook <keescook@chromium.org> Acked-by: Nick Desaulniers <ndesaulniers@google.com> Link: https://lkml.kernel.org/r/20211119165630.276205624@infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 06741ef commit b4296a7

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,7 @@ endif
687687

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

0 commit comments

Comments
 (0)