1.1 --- a/arch/alpha/config.in	Fri Jun 27 14:55:22 2008 +0000
     1.2 +++ b/arch/alpha/config.in	Fri Jun 27 15:08:43 2008 +0000
     1.3 @@ -1,6 +1,8 @@
     1.4  # Alpha specific configuration file
     1.5  
     1.6  config ARCH_alpha
     1.7 +    select ARCH_SUPPORT_CPU
     1.8 +    select ARCH_SUPPORT_TUNE
     1.9      help
    1.10        The Alpha architecture.
    1.11  

     2.1 --- a/arch/arm/config.in	Fri Jun 27 14:55:22 2008 +0000
     2.2 +++ b/arch/arm/config.in	Fri Jun 27 15:08:43 2008 +0000
     2.3 @@ -3,6 +3,11 @@
     2.4  config ARCH_arm
     2.5      select ARCH_SUPPORTS_BOTH_ENDIAN
     2.6      select ARCH_DEFAULT_LE
     2.7 +    select ARCH_SUPPORT_ARCH
     2.8 +    select ARCH_SUPPORT_ABI
     2.9 +    select ARCH_SUPPORT_CPU
    2.10 +    select ARCH_SUPPORT_TUNE
    2.11 +    select ARCH_SUPPORT_FPU
    2.12      help
    2.13        The ARM architecture, as defined by:
    2.14          http://www.arm.com/

     3.1 --- a/arch/mips/config.in	Fri Jun 27 14:55:22 2008 +0000
     3.2 +++ b/arch/mips/config.in	Fri Jun 27 15:08:43 2008 +0000
     3.3 @@ -3,6 +3,9 @@
     3.4  config ARCH_mips
     3.5      select ARCH_SUPPORTS_BOTH_ENDIAN
     3.6      select ARCH_DEFAULT_BE
     3.7 +    select ARCH_SUPPORT_ARCH
     3.8 +    select ARCH_SUPPORT_ABI
     3.9 +    select ARCH_SUPPORT_TUNE
    3.10      help
    3.11        The MIPS architecture, as defined by:
    3.12          http://www.mips.com/

     4.1 --- a/arch/powerpc/config.in	Fri Jun 27 14:55:22 2008 +0000
     4.2 +++ b/arch/powerpc/config.in	Fri Jun 27 15:08:43 2008 +0000
     4.3 @@ -1,6 +1,9 @@
     4.4  # powerpc specific configuration file
     4.5  
     4.6  config ARCH_powerpc
     4.7 +    select ARCH_SUPPORT_ABI
     4.8 +    select ARCH_SUPPORT_CPU
     4.9 +    select ARCH_SUPPORT_TUNE
    4.10      help
    4.11        The PowerPC architecture, as defined by:
    4.12          http://www.ibm.com/developerworks/eserver/articles/archguide.html

     5.1 --- a/arch/x86/config.in	Fri Jun 27 14:55:22 2008 +0000
     5.2 +++ b/arch/x86/config.in	Fri Jun 27 15:08:43 2008 +0000
     5.3 @@ -1,6 +1,9 @@
     5.4  # x86 specific options
     5.5  
     5.6  config ARCH_x86
     5.7 +    select ARCH_SUPPORT_ARCH
     5.8 +    select ARCH_SUPPORT_CPU
     5.9 +    select ARCH_SUPPORT_TUNE
    5.10      help
    5.11        The x86 architecture, as defined by:
    5.12          http://www.intel.com/

     6.1 --- a/arch/x86_64/config.in	Fri Jun 27 14:55:22 2008 +0000
     6.2 +++ b/arch/x86_64/config.in	Fri Jun 27 15:08:43 2008 +0000
     6.3 @@ -1,6 +1,9 @@
     6.4  # x86_64 specific options
     6.5  
     6.6  config ARCH_x86_64
     6.7 +    select ARCH_SUPPORT_ARCH
     6.8 +    select ARCH_SUPPORT_CPU
     6.9 +    select ARCH_SUPPORT_TUNE
    6.10      help
    6.11        The x86_64 architecture, as defined by:
    6.12          http://www.amd.com/us-en/Processors/DevelopWithAMD/0,,30_2252_875_7044,00.html

     7.1 --- a/config/target.in	Fri Jun 27 14:55:22 2008 +0000
     7.2 +++ b/config/target.in	Fri Jun 27 15:08:43 2008 +0000
     7.3 @@ -6,10 +6,15 @@
     7.4      string
     7.5  
     7.6  # Pre-declare target optimisation variables
     7.7 +config ARCH_SUPPORT_ARCH
     7.8  config ARCH_ARCH
     7.9 +config ARCH_SUPPORT_ABI
    7.10  config ARCH_ABI
    7.11 +config ARCH_SUPPORT_CPU
    7.12  config ARCH_CPU
    7.13 +config ARCH_SUPPORT_TUNE
    7.14  config ARCH_TUNE
    7.15 +config ARCH_SUPPORT_FPU
    7.16  config ARCH_FPU
    7.17  config ARCH_SUPPORTS_BOTH_ENDIAN
    7.18  config ARCH_DEFAULT_BE
    7.19 @@ -59,9 +64,30 @@
    7.20  
    7.21  comment "Target optimisations"
    7.22  
    7.23 +config ARCH_SUPPORT_ARCH
    7.24 +    bool
    7.25 +    default n
    7.26 +
    7.27 +config ARCH_SUPPORT_ABI
    7.28 +    bool
    7.29 +    default n
    7.30 +
    7.31 +config ARCH_SUPPORT_CPU
    7.32 +    bool
    7.33 +    default n
    7.34 +
    7.35 +config ARCH_SUPPORT_TUNE
    7.36 +    bool
    7.37 +    default n
    7.38 +
    7.39 +config ARCH_SUPPORT_FPU
    7.40 +    bool
    7.41 +    default n
    7.42 +
    7.43  config ARCH_ARCH
    7.44      string
    7.45      prompt "Architecture level"
    7.46 +    depends on ARCH_SUPPORT_ARCH
    7.47      default ""
    7.48      help
    7.49        GCC uses this name to determine what kind of instructions it can emit
    7.50 @@ -81,6 +107,7 @@
    7.51  config ARCH_ABI
    7.52      string
    7.53      prompt "Generate code for the specific ABI"
    7.54 +    depends on ARCH_SUPPORT_ABI
    7.55      default ""
    7.56      help
    7.57        Generate code for the given ABI.
    7.58 @@ -97,6 +124,7 @@
    7.59  config ARCH_CPU
    7.60      string
    7.61      prompt "Emit assembly for CPU"
    7.62 +    depends on ARCH_SUPPORT_CPU
    7.63      default ""
    7.64      help
    7.65        This specifies the name of the target processor. GCC uses this name
    7.66 @@ -115,6 +143,7 @@
    7.67  config ARCH_TUNE
    7.68      string
    7.69      prompt "Tune for CPU"
    7.70 +    depends on ARCH_SUPPORT_TUNE
    7.71      default ""
    7.72      help
    7.73        This option is very similar to the ARCH_CPU option (above), except
    7.74 @@ -137,6 +166,7 @@
    7.75  config ARCH_FPU
    7.76      string
    7.77      prompt "Use specific FPU"
    7.78 +    depends on ARCH_SUPPORT_FPU
    7.79      default ""
    7.80      help
    7.81        On some targets (eg. ARM), you can specify the kind of FPU to emit