Commit 27b5de62 authored Jan 20, 2023 by Nathan Chancellor Committed by Ingo Molnar Jan 22, 2023

x86/build: Move '-mindirect-branch-cs-prefix' out of GCC-only block



LLVM 16 will have support for this flag so move it out of the GCC-only
block to allow LLVM builds to take advantage of it.

Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://github.com/ClangBuiltLinux/linux/issues/1665
Link: https://github.com/llvm/llvm-project/commit/6f867f9102838ebe314c1f3661fdf95700386e5a
Link: https://lore.kernel.org/r/20230120165826.2469302-1-nathan@kernel.org

parent fe0ba8c2

arch/x86/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,13 +14,13 @@ 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
		RETPOLINE_CFLAGS := -mretpoline-external-thunk
		RETPOLINE_VDSO_CFLAGS := -mretpoline
		endif
		RETPOLINE_CFLAGS += $(call cc-option,-mindirect-branch-cs-prefix)

		ifdef CONFIG_RETHUNK
		RETHUNK_CFLAGS := -mfunction-return=thunk-extern