Restrict flat format to architectures that support it

Fixes #878 Signed-off-by: Alexey Neyman <stilor@att.net>
crosstool-ng · Dec 1, 2018 · d1910b9 · d1910b9
1 parent c34fe6e
commit d1910b9
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 3 deletions.
diff --git a/config/arch/arm.in b/config/arch/arm.in
@@ -6,6 +6,7 @@
 ## select ARCH_DEFAULT_32
 ## select ARCH_SUPPORTS_BOTH_MMU
 ## select ARCH_DEFAULT_HAS_MMU
+## select ARCH_SUPPORTS_FLAT_FORMAT
 ## select ARCH_SUPPORTS_EITHER_ENDIAN
 ## select ARCH_DEFAULT_LE
 ## select ARCH_SUPPORTS_WITH_ARCH

diff --git a/config/arch/m68k.in b/config/arch/m68k.in
@@ -4,6 +4,7 @@
 ## select ARCH_SUPPORTS_32
 ## select ARCH_DEFAULT_32
 ## select ARCH_DEFAULT_BE
+## select ARCH_SUPPORTS_FLAT_FORMAT
 ## select ARCH_SUPPORTS_WITH_CPU
 ##
 ## help The m68k architecture
diff --git a/config/arch/microblaze.in b/config/arch/microblaze.in
@@ -9,6 +9,7 @@
 ## select ARCH_DEFAULT_BE
 ## select ARCH_SUPPORTS_BOTH_MMU
 ## select ARCH_DEFAULT_HAS_MMU
+## select ARCH_SUPPORTS_FLAT_FORMAT
 ##
 ## help The MicroBlaze architecture, as defined by:
 ## help     http://www.xilinx.com/

diff --git a/config/arch/nios2.in b/config/arch/nios2.in
@@ -6,6 +6,7 @@
 ## select ARCH_SUPPORTS_BOTH_MMU
 ## select ARCH_DEFAULT_LE
 ## select ARCH_SUPPORTS_WITH_ARCH
+## select ARCH_SUPPORTS_FLAT_FORMAT
 ##
 ## help The NIOS2 architecture, as defined by:
 ## help     http://www.altera.com
diff --git a/config/arch/sh.in b/config/arch/sh.in
@@ -3,7 +3,9 @@
 ## no-package
 ## select ARCH_SUPPORTS_32
 ## select ARCH_DEFAULT_32
-## select ARCH_USE_MMU
+## select ARCH_SUPPORTS_BOTH_MMU
+## select ARCH_DEFAULT_HAS_MMU
+## select ARCH_SUPPORTS_FLAT_FORMAT
 ## select ARCH_SUPPORTS_EITHER_ENDIAN
 ## select ARCH_DEFAULT_LE
 ## select ARCH_REQUIRES_MULTILIB

diff --git a/config/arch/sparc.in b/config/arch/sparc.in
@@ -4,7 +4,9 @@
 ## select ARCH_SUPPORTS_32
 ## select ARCH_SUPPORTS_64
 ## select ARCH_DEFAULT_32
-## select ARCH_USE_MMU
+## select ARCH_SUPPORTS_BOTH_MMU
+## select ARCH_DEFAULT_HAS_MMU
+## select ARCH_SUPPORTS_FLAT_FORMAT
 ## select ARCH_SUPPORTS_WITH_CPU
 ## select ARCH_SUPPORTS_WITH_TUNE
 ## select ARCH_SUPPORTS_WITH_FLOAT

diff --git a/config/arch/xtensa.in b/config/arch/xtensa.in
@@ -6,6 +6,7 @@
 ## select ARCH_DEFAULT_LE
 ## select ARCH_SUPPORTS_BOTH_MMU
 ## select ARCH_DEFAULT_HAS_MMU
+## select ARCH_SUPPORTS_FLAT_FORMAT
 
 ## help The xtensa architecture
 ## help

diff --git a/config/binutils.in b/config/binutils.in
@@ -17,7 +17,7 @@ config ARCH_BINFMT_ELF
 config ARCH_BINFMT_FLAT
     bool
     prompt "Flat"
-    depends on ! ARCH_USE_MMU
+    depends on ! ARCH_USE_MMU && ARCH_SUPPORTS_FLAT_FORMAT
     help
       This will build flat binaries, suitable for
       MMU-less architectures.

diff --git a/config/target.in b/config/target.in
@@ -92,6 +92,10 @@ config ARCH_USE_MMU
       lacks an MMU (eg. ARM Cortex-M3), while other variants
       have one (eg. ARM Cortex-A8).
 
+#--------------------------------------
+config ARCH_SUPPORTS_FLAT_FORMAT
+    bool
+
 #--------------------------------------
 config ARCH_SUPPORTS_EITHER_ENDIAN
     bool