Skip to content

Commit 87b28d7

Browse files
committed
riscv: Remove ld.lld version checks from many TOOLCHAIN_HAS configs
Now that the minimum supported version of LLVM for building the kernel has been bumped to 15.0.0, several ld.lld version checks become tautological, as they are always true. Replace them with a simple CONFIG_LD_IS_LLD check. Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Acked-by: Alexandre Ghiti <alexghiti@rivosinc.com> Link: https://lore.kernel.org/r/20250821-bump-min-llvm-ver-15-v2-9-635f3294e5f0@kernel.org Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent 7ccbe91 commit 87b28d7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

arch/riscv/Kconfig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ config TOOLCHAIN_HAS_V
620620
default y
621621
depends on !64BIT || $(cc-option,-mabi=lp64 -march=rv64imv)
622622
depends on !32BIT || $(cc-option,-mabi=ilp32 -march=rv32imv)
623-
depends on LLD_VERSION >= 140000 || LD_VERSION >= 23800
623+
depends on LD_IS_LLD || LD_VERSION >= 23800
624624
depends on AS_HAS_OPTION_ARCH
625625

626626
config RISCV_ISA_V
@@ -721,7 +721,7 @@ config TOOLCHAIN_HAS_ZBB
721721
default y
722722
depends on !64BIT || $(cc-option,-mabi=lp64 -march=rv64ima_zbb)
723723
depends on !32BIT || $(cc-option,-mabi=ilp32 -march=rv32ima_zbb)
724-
depends on LLD_VERSION >= 150000 || LD_VERSION >= 23900
724+
depends on LD_IS_LLD || LD_VERSION >= 23900
725725
depends on AS_HAS_OPTION_ARCH
726726

727727
# This symbol indicates that the toolchain supports all v1.0 vector crypto
@@ -736,7 +736,7 @@ config TOOLCHAIN_HAS_ZBA
736736
default y
737737
depends on !64BIT || $(cc-option,-mabi=lp64 -march=rv64ima_zba)
738738
depends on !32BIT || $(cc-option,-mabi=ilp32 -march=rv32ima_zba)
739-
depends on LLD_VERSION >= 150000 || LD_VERSION >= 23900
739+
depends on LD_IS_LLD || LD_VERSION >= 23900
740740
depends on AS_HAS_OPTION_ARCH
741741

742742
config RISCV_ISA_ZBA
@@ -771,7 +771,7 @@ config TOOLCHAIN_HAS_ZBC
771771
default y
772772
depends on !64BIT || $(cc-option,-mabi=lp64 -march=rv64ima_zbc)
773773
depends on !32BIT || $(cc-option,-mabi=ilp32 -march=rv32ima_zbc)
774-
depends on LLD_VERSION >= 150000 || LD_VERSION >= 23900
774+
depends on LD_IS_LLD || LD_VERSION >= 23900
775775
depends on AS_HAS_OPTION_ARCH
776776

777777
config RISCV_ISA_ZBC
@@ -794,7 +794,7 @@ config TOOLCHAIN_HAS_ZBKB
794794
default y
795795
depends on !64BIT || $(cc-option,-mabi=lp64 -march=rv64ima_zbkb)
796796
depends on !32BIT || $(cc-option,-mabi=ilp32 -march=rv32ima_zbkb)
797-
depends on LLD_VERSION >= 150000 || LD_VERSION >= 23900
797+
depends on LD_IS_LLD || LD_VERSION >= 23900
798798
depends on AS_HAS_OPTION_ARCH
799799

800800
config RISCV_ISA_ZBKB

0 commit comments

Comments
 (0)