Only present each of arch, abi, cpu tune and fpu optimisations for those targets supporting them.

/trunk/config/target.in       |   30    30     0     0 ++++++++++++++++++++++++++++++
 /trunk/arch/arm/config.in     |    5     5     0     0 +++++
 /trunk/arch/powerpc/config.in |    3     3     0     0 +++
 /trunk/arch/alpha/config.in   |    2     2     0     0 ++
 /trunk/arch/x86/config.in     |    3     3     0     0 +++
 /trunk/arch/mips/config.in    |    3     3     0     0 +++
 /trunk/arch/x86_64/config.in  |    3     3     0     0 +++
 7 files changed, 49 insertions(+)

arch/alpha/config.in

@@ -1,6 +1,8 @@
 # Alpha specific configuration file
 
 config ARCH_alpha
+    select ARCH_SUPPORT_CPU
+    select ARCH_SUPPORT_TUNE
     help
       The Alpha architecture.
 

arch/arm/config.in

@@ -3,6 +3,11 @@
 config ARCH_arm
     select ARCH_SUPPORTS_BOTH_ENDIAN
     select ARCH_DEFAULT_LE
+    select ARCH_SUPPORT_ARCH
+    select ARCH_SUPPORT_ABI
+    select ARCH_SUPPORT_CPU
+    select ARCH_SUPPORT_TUNE
+    select ARCH_SUPPORT_FPU
     help
       The ARM architecture, as defined by:
         http://www.arm.com/

arch/mips/config.in

@@ -3,6 +3,9 @@
 config ARCH_mips
     select ARCH_SUPPORTS_BOTH_ENDIAN
     select ARCH_DEFAULT_BE
+    select ARCH_SUPPORT_ARCH
+    select ARCH_SUPPORT_ABI
+    select ARCH_SUPPORT_TUNE
     help
       The MIPS architecture, as defined by:
         http://www.mips.com/

arch/powerpc/config.in

@@ -1,6 +1,9 @@
 # powerpc specific configuration file
 
 config ARCH_powerpc
+    select ARCH_SUPPORT_ABI
+    select ARCH_SUPPORT_CPU
+    select ARCH_SUPPORT_TUNE
     help
       The PowerPC architecture, as defined by:
         http://www.ibm.com/developerworks/eserver/articles/archguide.html

arch/x86/config.in

@@ -1,6 +1,9 @@
 # x86 specific options
 
 config ARCH_x86
+    select ARCH_SUPPORT_ARCH
+    select ARCH_SUPPORT_CPU
+    select ARCH_SUPPORT_TUNE
     help
       The x86 architecture, as defined by:
         http://www.intel.com/

arch/x86_64/config.in

@@ -1,6 +1,9 @@
 # x86_64 specific options
 
 config ARCH_x86_64
+    select ARCH_SUPPORT_ARCH
+    select ARCH_SUPPORT_CPU
+    select ARCH_SUPPORT_TUNE
     help
       The x86_64 architecture, as defined by:
         http://www.amd.com/us-en/Processors/DevelopWithAMD/0,,30_2252_875_7044,00.html

config/target.in

@@ -6,10 +6,15 @@ config ARCH
     string
 
 # Pre-declare target optimisation variables
+config ARCH_SUPPORT_ARCH
 config ARCH_ARCH
+config ARCH_SUPPORT_ABI
 config ARCH_ABI
+config ARCH_SUPPORT_CPU
 config ARCH_CPU
+config ARCH_SUPPORT_TUNE
 config ARCH_TUNE
+config ARCH_SUPPORT_FPU
 config ARCH_FPU
 config ARCH_SUPPORTS_BOTH_ENDIAN
 config ARCH_DEFAULT_BE
@@ -59,9 +64,30 @@ endchoice
 
 comment "Target optimisations"
 
+config ARCH_SUPPORT_ARCH
+    bool
+    default n
+
+config ARCH_SUPPORT_ABI
+    bool
+    default n
+
+config ARCH_SUPPORT_CPU
+    bool
+    default n
+
+config ARCH_SUPPORT_TUNE
+    bool
+    default n
+
+config ARCH_SUPPORT_FPU
+    bool
+    default n
+
 config ARCH_ARCH
     string
     prompt "Architecture level"
+    depends on ARCH_SUPPORT_ARCH
     default ""
     help
       GCC uses this name to determine what kind of instructions it can emit
@@ -81,6 +107,7 @@ config ARCH_ARCH
 config ARCH_ABI
     string
     prompt "Generate code for the specific ABI"
+    depends on ARCH_SUPPORT_ABI
     default ""
     help
       Generate code for the given ABI.
@@ -97,6 +124,7 @@ config ARCH_ABI
 config ARCH_CPU
     string
     prompt "Emit assembly for CPU"
+    depends on ARCH_SUPPORT_CPU
     default ""
     help
       This specifies the name of the target processor. GCC uses this name
@@ -115,6 +143,7 @@ config ARCH_CPU
 config ARCH_TUNE
     string
     prompt "Tune for CPU"
+    depends on ARCH_SUPPORT_TUNE
     default ""
     help
       This option is very similar to the ARCH_CPU option (above), except
@@ -137,6 +166,7 @@ config ARCH_TUNE
 config ARCH_FPU
     string
     prompt "Use specific FPU"
+    depends on ARCH_SUPPORT_FPU
     default ""
     help
       On some targets (eg. ARM), you can specify the kind of FPU to emit