From d1910b945b7a592bc7881fdef4844b3c8af5cdbb Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 1 Dec 2018 15:08:46 -0800 Subject: Restrict flat format to architectures that support it Fixes #878 Signed-off-by: Alexey Neyman diff --git a/config/arch/arm.in b/config/arch/arm.in index 37575aa..a6b9694 100644 --- 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 index 60279da..d21de00 100644 --- 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 index 7e5ceea..c8496ee 100644 --- 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 index b3b1249..de28246 100644 --- 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 index 0c75e78..ff2ec14 100644 --- 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 index c5dafe0..1b4abcc 100644 --- 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 index cf1fb64..14ba10d 100644 --- 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 index a483881..c4762aa 100644 --- 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 index 677c67e..03ecb6b 100644 --- a/config/target.in +++ b/config/target.in @@ -93,6 +93,10 @@ config ARCH_USE_MMU have one (eg. ARM Cortex-A8). #-------------------------------------- +config ARCH_SUPPORTS_FLAT_FORMAT + bool + +#-------------------------------------- config ARCH_SUPPORTS_EITHER_ENDIAN bool help -- cgit v0.10.2-6-g49f6