diff options
| author | Nathan Chancellor <nathan@kernel.org> | 2025-08-14 18:31:42 -0700 |
|---|---|---|
| committer | Borislav Petkov (AMD) <bp@alien8.de> | 2025-08-17 13:10:39 +0200 |
| commit | 2c6a28f3ef729ed2d5b174b4e0f33172fb286bab (patch) | |
| tree | b6607e9747f59355185897ef0e2cb9be86845e16 | |
| parent | 337927d9895a800a63ffe852616ab05f5d304971 (diff) | |
| download | linux-2c6a28f3ef729ed2d5b174b4e0f33172fb286bab.tar.gz linux-2c6a28f3ef729ed2d5b174b4e0f33172fb286bab.zip | |
x86/Kconfig: Clean up LLVM version checks in IBT configurations
The minimum supported version of LLVM for building the x86 kernel
was bumped to 15.0.0 in
7861640aac52 ("x86/build: Raise the minimum LLVM version to 15.0.0"),
so the checks for Clang 14.0.0 and ld.lld 14.0.0 or newer will always been
true. Clean them up.
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/20250814-x86-min-ver-cleanups-v1-6-ff7f19457523@kernel.org
| -rw-r--r-- | arch/x86/Kconfig | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 58d890fe2100..85b91267c01c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1753,11 +1753,7 @@ config X86_UMIP config CC_HAS_IBT # GCC >= 9 and binutils >= 2.29 # Retpoline check to work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93654 - # Clang/LLVM >= 14 - # https://github.com/llvm/llvm-project/commit/e0b89df2e0f0130881bf6c39bf31d7f6aac00e0f - # https://github.com/llvm/llvm-project/commit/dfcf69770bc522b9e411c66454934a37c1f35332 - def_bool ((CC_IS_GCC && $(cc-option, -fcf-protection=branch -mindirect-branch-register)) || \ - (CC_IS_CLANG && CLANG_VERSION >= 140000)) && \ + def_bool ((CC_IS_GCC && $(cc-option, -fcf-protection=branch -mindirect-branch-register)) || CC_IS_CLANG) && \ $(as-instr,endbr64) config X86_CET @@ -1769,8 +1765,6 @@ config X86_KERNEL_IBT prompt "Indirect Branch Tracking" def_bool y depends on X86_64 && CC_HAS_IBT && HAVE_OBJTOOL - # https://github.com/llvm/llvm-project/commit/9d7001eba9c4cb311e03cd8cdc231f9e579f2d0f - depends on !LD_IS_LLD || LLD_VERSION >= 140000 select OBJTOOL select X86_CET help |