aboutsummaryrefslogtreecommitdiff
path: root/config/arch
diff options
context:
space:
mode:
Diffstat (limited to 'config/arch')
-rw-r--r--config/arch/arm.in15
1 files changed, 9 insertions, 6 deletions
diff --git a/config/arch/arm.in b/config/arch/arm.in
index 07ad5ed2..5b55c2ae 100644
--- a/config/arch/arm.in
+++ b/config/arch/arm.in
@@ -9,13 +9,13 @@
## select ARCH_SUPPORTS_FLAT_FORMAT
## select ARCH_SUPPORTS_EITHER_ENDIAN
## select ARCH_DEFAULT_LE
-## select ARCH_SUPPORTS_WITH_ARCH
-## select ARCH_SUPPORTS_WITH_CPU
+## select ARCH_SUPPORTS_WITH_ARCH if !(MULTILIB && ARCH_32)
+## select ARCH_SUPPORTS_WITH_CPU if !(MULTILIB && ARCH_32)
## select ARCH_EXCLUSIVE_WITH_CPU
-## select ARCH_SUPPORTS_WITH_TUNE
-## select ARCH_SUPPORTS_WITH_FLOAT if ARCH_32
-## select ARCH_SUPPORTS_WITH_FPU if ARCH_32
-## select ARCH_SUPPORTS_SOFTFP if ARCH_32
+## select ARCH_SUPPORTS_WITH_TUNE if !(MULTILIB && ARCH_32)
+## select ARCH_SUPPORTS_WITH_FLOAT if ARCH_32 && !MULTILIB
+## select ARCH_SUPPORTS_WITH_FPU if ARCH_32 && !MULTILIB
+## select ARCH_SUPPORTS_SOFTFP if ARCH_32 && !MULTILIB
## select LINUX_REQUIRE_3_7_or_later if ARCH_64 && KERNEL_LINUX
## help The ARM architecture, as defined by:
@@ -26,11 +26,13 @@ config ARCH_ARM_MODE
string
default "arm" if ARCH_ARM_MODE_ARM
default "thumb" if ARCH_ARM_MODE_THUMB
+ depends on !MULTILIB
choice
bool
prompt "Default instruction set mode"
default ARCH_ARM_MODE_ARM
+ depends on !MULTILIB
config ARCH_ARM_MODE_ARM
bool
@@ -49,6 +51,7 @@ endchoice
config ARCH_ARM_INTERWORKING
bool
prompt "Use Thumb-interworking (READ HELP)"
+ depends on !MULTILIB
help
Excerpt from the gcc manual: