* [PATCH RESEND] x86/build: Move '-mindirect-branch-cs-prefix' out of GCC-only block
@ 2023-01-20 16:58 Nathan Chancellor
2023-01-22 10:42 ` [tip: x86/urgent] " tip-bot2 for Nathan Chancellor
0 siblings, 1 reply; 2+ messages in thread
From: Nathan Chancellor @ 2023-01-20 16:58 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86
Cc: linux-kernel, patches, llvm, Nathan Chancellor, Peter Zijlstra,
Nick Desaulniers
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.
Link: https://github.com/ClangBuiltLinux/linux/issues/1665
Link: https://github.com/llvm/llvm-project/commit/6f867f9102838ebe314c1f3661fdf95700386e5a
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
I picked up the tags on the previous patch but otherwise, this is
indentical to the original posting:
https://lore.kernel.org/20220817185410.1174782-1-nathan@kernel.org/
arch/x86/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 9cf07322875a..73ed982d4100 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -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
base-commit: 5dc4c995db9eb45f6373a956eb1f69460e69e6d4
--
2.39.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/urgent] x86/build: Move '-mindirect-branch-cs-prefix' out of GCC-only block
2023-01-20 16:58 [PATCH RESEND] x86/build: Move '-mindirect-branch-cs-prefix' out of GCC-only block Nathan Chancellor
@ 2023-01-22 10:42 ` tip-bot2 for Nathan Chancellor
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Nathan Chancellor @ 2023-01-22 10:42 UTC (permalink / raw)
To: linux-tip-commits
Cc: Nathan Chancellor, Ingo Molnar, Nick Desaulniers,
Peter Zijlstra (Intel),
x86, linux-kernel
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 27b5de622ea3fe0ad5a31a0ebd9f7a0a276932d1
Gitweb: https://git.kernel.org/tip/27b5de622ea3fe0ad5a31a0ebd9f7a0a276932d1
Author: Nathan Chancellor <nathan@kernel.org>
AuthorDate: Fri, 20 Jan 2023 09:58:27 -07:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sun, 22 Jan 2023 11:36:45 +01:00
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
---
arch/x86/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 9cf0732..73ed982 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-22 10:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-20 16:58 [PATCH RESEND] x86/build: Move '-mindirect-branch-cs-prefix' out of GCC-only block Nathan Chancellor
2023-01-22 10:42 ` [tip: x86/urgent] " tip-bot2 for Nathan Chancellor
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).