[PATCH v3 2/2] kconfig: Remove the architecture specific config for Propeller
From: xur
Date: Wed May 27 2026 - 17:45:48 EST
From: Rong Xu <xur@xxxxxxxxxx>
The CONFIG_PROPELLER_CLANG option currently depends on
ARCH_SUPPORTS_PROPELLER_CLANG, but this dependency seems unnecessary.
Remove ARCH_SUPPORTS_PROPELLER_CLANG and allow users to control
Propeller builds solely through CONFIG_PROPELLER_CLANG. This simplifies
the kconfig and avoids potential confusion.
For arm64, change vmlinux.lds.S to ensure the .llvm_bb_addr_map is
explicitly placed within its own section.
Signed-off-by: Rong Xu <xur@xxxxxxxxxx>
Suggested-by: Will Deacon <will@xxxxxxxxxx>
Tested-by: Yabin Cui <yabinc@xxxxxxxxxx>
Reviewed-by: Kees Cook <kees@xxxxxxxxxx>
---
arch/Kconfig | 4 ----
arch/arm64/kernel/vmlinux.lds.S | 3 +++
arch/x86/Kconfig | 1 -
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index e510c585ea84..e4eaca9c917c 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -879,12 +879,8 @@ config AUTOFDO_CLANG
If unsure, say N.
-config ARCH_SUPPORTS_PROPELLER_CLANG
- bool
-
config PROPELLER_CLANG
bool "Enable Clang's Propeller build"
- depends on ARCH_SUPPORTS_PROPELLER_CLANG
depends on CC_IS_CLANG && CLANG_VERSION >= 190000
help
This option enables Clang’s Propeller build. When the Propeller
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index e1ac876200a3..44a42e7c66cf 100644
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -368,6 +368,9 @@ SECTIONS
STABS_DEBUG
DWARF_DEBUG
+#ifdef CONFIG_PROPELLER_CLANG
+ .llvm_bb_addr_map : { *(.llvm_bb_addr_map) }
+#endif
MODINFO
ELF_DETAILS
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 10bf3984102e..b875d2f27e48 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -130,7 +130,6 @@ config X86
select ARCH_SUPPORTS_LTO_CLANG
select ARCH_SUPPORTS_LTO_CLANG_THIN
select ARCH_SUPPORTS_RT
- select ARCH_SUPPORTS_PROPELLER_CLANG if X86_64
select ARCH_USE_BUILTIN_BSWAP
select ARCH_USE_CMPXCHG_LOCKREF if X86_CX8
select ARCH_USE_MEMTEST
--
2.54.0.794.g4f17f83d09-goog