Skip to content

Commit 2c6a28f

Browse files
nathanchancebp3tk0v
authored andcommitted
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 7861640 ("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
1 parent 337927d commit 2c6a28f

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

arch/x86/Kconfig

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,11 +1753,7 @@ config X86_UMIP
17531753
config CC_HAS_IBT
17541754
# GCC >= 9 and binutils >= 2.29
17551755
# Retpoline check to work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93654
1756-
# Clang/LLVM >= 14
1757-
# https://github.com/llvm/llvm-project/commit/e0b89df2e0f0130881bf6c39bf31d7f6aac00e0f
1758-
# https://github.com/llvm/llvm-project/commit/dfcf69770bc522b9e411c66454934a37c1f35332
1759-
def_bool ((CC_IS_GCC && $(cc-option, -fcf-protection=branch -mindirect-branch-register)) || \
1760-
(CC_IS_CLANG && CLANG_VERSION >= 140000)) && \
1756+
def_bool ((CC_IS_GCC && $(cc-option, -fcf-protection=branch -mindirect-branch-register)) || CC_IS_CLANG) && \
17611757
$(as-instr,endbr64)
17621758

17631759
config X86_CET
@@ -1769,8 +1765,6 @@ config X86_KERNEL_IBT
17691765
prompt "Indirect Branch Tracking"
17701766
def_bool y
17711767
depends on X86_64 && CC_HAS_IBT && HAVE_OBJTOOL
1772-
# https://github.com/llvm/llvm-project/commit/9d7001eba9c4cb311e03cd8cdc231f9e579f2d0f
1773-
depends on !LD_IS_LLD || LLD_VERSION >= 140000
17741768
select OBJTOOL
17751769
select X86_CET
17761770
help

0 commit comments

Comments
 (0)