1.1 --- a/config/target.in	Sat Jun 14 20:57:57 2008 +0000
     1.2 +++ b/config/target.in	Fri Jun 27 13:58:53 2008 +0000
     1.3 @@ -2,65 +2,29 @@
     1.4  
     1.5  menu "Target options"
     1.6  
     1.7 -comment "General target options"
     1.8 -
     1.9  config ARCH
    1.10      string
    1.11 -    default "alpha"   if ARCH_ALPHA
    1.12 -    default "arm"     if ARCH_ARM
    1.13 -    default "ia64"    if ARCH_IA64
    1.14 -    default "mips"    if ARCH_MIPS
    1.15 -    default "powerpc" if ARCH_PPC
    1.16 -    default "sh"      if ARCH_SH
    1.17 -    default "x86"     if ARCH_x86
    1.18 -    default "x86_64"  if ARCH_x86_64
    1.19 +
    1.20 +# Pre-declare target optimisation variables
    1.21 +config ARCH_ARCH
    1.22 +config ARCH_ABI
    1.23 +config ARCH_CPU
    1.24 +config ARCH_TUNE
    1.25 +config ARCH_FPU
    1.26 +config ARCH_SUPPORTS_BOTH_ENDIAN
    1.27 +config ARCH_DEFAULT_BE
    1.28 +config ARCH_DEFAULT_LE
    1.29 +config ARCH_FLOAT_HW
    1.30 +config ARCH_FLOAT_SW
    1.31 +config TARGET_CFLAGS
    1.32 +
    1.33 +comment "General target options"
    1.34  
    1.35  choice
    1.36      bool
    1.37      prompt "Target architecture:"
    1.38 -    default ARCH_x86
    1.39  
    1.40 -config ARCH_ALPHA
    1.41 -    bool
    1.42 -    prompt "alpha (EXPERIMENTAL)"
    1.43 -    depends on EXPERIMENTAL
    1.44 -
    1.45 -config ARCH_ARM
    1.46 -    bool
    1.47 -    prompt "arm"
    1.48 -    select ARCH_SUPPORTS_BOTH_ENDIAN
    1.49 -    select ARCH_DEFAULT_LE
    1.50 -
    1.51 -config ARCH_IA64
    1.52 -    bool
    1.53 -    prompt "ia64 (EXPERIMENTAL)"
    1.54 -    depends on EXPERIMENTAL
    1.55 -    select ARCH_SUPPORTS_BOTH_ENDIAN
    1.56 -
    1.57 -config ARCH_MIPS
    1.58 -    bool
    1.59 -    prompt "mips"
    1.60 -    select ARCH_SUPPORTS_BOTH_ENDIAN
    1.61 -    select ARCH_DEFAULT_BE
    1.62 -
    1.63 -config ARCH_PPC
    1.64 -    bool
    1.65 -    prompt "powerpc"
    1.66 -
    1.67 -config ARCH_SH
    1.68 -    bool
    1.69 -    prompt "sh (EXPERIMENTAL)"
    1.70 -    depends on EXPERIMENTAL
    1.71 -    select ARCH_SUPPORTS_BOTH_ENDIAN
    1.72 -    select ARCH_DEFAULT_LE
    1.73 -
    1.74 -config ARCH_x86
    1.75 -    bool
    1.76 -    prompt "x86"
    1.77 -
    1.78 -config ARCH_x86_64
    1.79 -    bool
    1.80 -    prompt "x86_64"
    1.81 +source config.gen/arch.in
    1.82  
    1.83  endchoice
    1.84  
    1.85 @@ -93,32 +57,6 @@
    1.86  
    1.87  endchoice
    1.88  
    1.89 -# Include architecture-specific configuration
    1.90 -if ARCH_ALPHA
    1.91 -source config/arch/alpha/config.in
    1.92 -endif
    1.93 -if ARCH_ARM
    1.94 -source config/arch/arm/config.in
    1.95 -endif
    1.96 -if ARCH_IA64
    1.97 -source config/arch/ia64/config.in
    1.98 -endif
    1.99 -if ARCH_MIPS
   1.100 -source config/arch/mips/config.in
   1.101 -endif
   1.102 -if ARCH_PPC
   1.103 -source config/arch/powerpc/config.in
   1.104 -endif
   1.105 -if ARCH_SH
   1.106 -source config/arch/sh/config.in
   1.107 -endif
   1.108 -if ARCH_x86
   1.109 -source config/arch/x86/config.in
   1.110 -endif
   1.111 -if ARCH_x86_64
   1.112 -source config/arch/x86_64/config.in
   1.113 -endif
   1.114 -
   1.115  comment "Target optimisations"
   1.116  
   1.117  config ARCH_ARCH