14 files changed, 42 insertions, 2 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 01b10ab588a..d9df913a464 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -67,6 +67,9 @@ config AUTO_IRQ_AFFINITY
         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 e19e7744e36..4127af93c5f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -126,6 +126,9 @@ config GENERIC_CALIBRATE_DELAY
         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 dc61222e112..b4ba4f8b505 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -65,6 +65,9 @@ config TIME_LOW_RES
         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 795180b8fd8..fe61e00a604 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -35,6 +35,9 @@ config NO_IOPORT
 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 ffabd01c45e..bcbf3e4ee9d 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -52,6 +52,9 @@ config NO_IOPORT
 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 6abbbb8aac5..24f732342d3 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -64,6 +64,9 @@ config TIME_LOW_RES
 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 028d8a0fdbf..d929ac84f25 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -75,6 +75,9 @@ config IRQ_PER_CPU
         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 1c3a90835c7..6e035d1cf78 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -89,6 +89,9 @@ config ARCH_HAS_ILOG2_U64
 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 99f8971716d..08821b078ec 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -27,6 +27,9 @@ config ARCH_NO_VIRT_TO_BUS
 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 a8c6366f05a..5023b815e52 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -81,6 +81,9 @@ config GENERIC_HARDIRQS_NO__DO_IRQ
         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_ELF32
 
 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 717f5d3440e..e75264603d2 100644
--- a/arch/um/Kconfig.i386
+++ b/arch/um/Kconfig.i386
@@ -84,3 +84,5 @@ config GENERIC_HWEIGHT
         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 d632e9a89cc..b438f0e1427 100644
--- a/arch/um/Kconfig.x86_64
+++ b/arch/um/Kconfig.x86_64
@@ -39,3 +39,5 @@ config GENERIC_HWEIGHT
         bool
         default y
 
+config ARCH_SUPPORTS_AOUT
+        def_bool y
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index ace479ab273..225f30d7cb3 100644
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -53,6 +53,9 @@ config ARCH_HAS_ILOG2_U64
         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 9d0acedf5f3..65a70b777c1 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -136,6 +136,9 @@ config AUDIT_ARCH
         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_EMULATION
 
 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.