aout: mark arches that support A.OUT format
Mark arches that support A.OUT format by including the following in their
master Kconfig files:
config ARCH_SUPPORTS_AOUT
def_bool y
This should also be set if the arch provides compatibility A.OUT support for
an older arch, for instance x86_64 for i386 or sparc64 for sparc.
I've guessed at which arches don't, based on comments in the code, however I'm
sure that some of the ones I've marked as 'yes' actually should be 'no'.
Signed-off-by: David Howells <dhowells@redhat.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 01b10ab..d9df913a4 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -67,6 +67,9 @@
depends on SMP
default y
+config ARCH_SUPPORTS_AOUT
+ def_bool y
+
source "init/Kconfig"
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e19e774..4127af9 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -126,6 +126,9 @@
bool
default y
+config ARCH_SUPPORTS_AOUT
+ def_bool y
+
config ARCH_MAY_HAVE_PC_FDC
bool
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index dc61222..b4ba4f8 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -65,6 +65,9 @@
bool
default y
+config ARCH_SUPPORTS_AOUT
+ def_bool y
+
config NO_IOPORT
def_bool y
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 795180b..fe61e00 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -35,6 +35,9 @@
config NO_DMA
def_bool y
+config ARCH_SUPPORTS_AOUT
+ def_bool y
+
source "init/Kconfig"
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index ffabd01..bcbf3e4 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -52,6 +52,9 @@
config NO_DMA
def_bool SUN3
+config ARCH_SUPPORTS_AOUT
+ def_bool y
+
mainmenu "Linux/68k Kernel Configuration"
source "init/Kconfig"
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 6abbbb8..24f7323 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -64,6 +64,9 @@
config NO_IOPORT
def_bool y
+config ARCH_SUPPORTS_AOUT
+ def_bool y
+
source "init/Kconfig"
menu "Processor type and features"
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 028d8a0..d929ac8 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -75,6 +75,9 @@
bool
default y
+config ARCH_SUPPORTS_AOUT
+ def_bool y
+
# unless you want to implement ACPI on PA-RISC ... ;-)
config PM
bool
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 1c3a908..6e035d1 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -89,6 +89,9 @@
config ARCH_NO_VIRT_TO_BUS
def_bool y
+config ARCH_SUPPORTS_AOUT
+ def_bool y
+
source "init/Kconfig"
menu "System type"
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 99f8971..08821b0 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -27,6 +27,9 @@
config OF
def_bool y
+config ARCH_SUPPORTS_AOUT
+ def_bool y
+
source "init/Kconfig"
menu "General machine setup"
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index a8c6366..5023b81 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -81,6 +81,9 @@
bool
def_bool y
+config ARCH_SUPPORTS_AOUT
+ def_bool y
+
choice
prompt "Kernel page size"
default SPARC64_PAGE_SIZE_8KB
@@ -390,7 +393,7 @@
config BINFMT_AOUT32
bool "Kernel support for 32-bit (ie. SunOS) a.out binaries"
- depends on SPARC32_COMPAT
+ depends on SPARC32_COMPAT && ARCH_SUPPORTS_AOUT
help
This allows you to run 32-bit a.out format binaries on your Ultra.
If you want to run SunOS binaries (see SunOS binary emulation below)
diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386
index 717f5d3..e752646 100644
--- a/arch/um/Kconfig.i386
+++ b/arch/um/Kconfig.i386
@@ -84,3 +84,5 @@
bool
default y
+config ARCH_SUPPORTS_AOUT
+ def_bool y
diff --git a/arch/um/Kconfig.x86_64 b/arch/um/Kconfig.x86_64
index d632e9a..b438f0e 100644
--- a/arch/um/Kconfig.x86_64
+++ b/arch/um/Kconfig.x86_64
@@ -39,3 +39,5 @@
bool
default y
+config ARCH_SUPPORTS_AOUT
+ def_bool y
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index ace479a..225f30d 100644
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -53,6 +53,9 @@
bool
default n
+config ARCH_SUPPORTS_AOUT
+ def_bool y
+
# Turn off some random 386 crap that can affect device config
config ISA
bool
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 9d0aced..65a70b7 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -136,6 +136,9 @@
bool
default X86_64
+config ARCH_SUPPORTS_AOUT
+ def_bool y
+
# Use the generic interrupt handling code in kernel/irq/:
config GENERIC_HARDIRQS
bool
@@ -1577,7 +1580,7 @@
config IA32_AOUT
tristate "IA32 a.out support"
- depends on IA32_EMULATION
+ depends on IA32_EMULATION && ARCH_SUPPORTS_AOUT
help
Support old a.out binaries in the 32bit emulation.
