diff -r 595b2ff3fbf4 -r 87802cb25a0f config/target.in
--- a/config/target.in	Sat Jun 14 20:57:57 2008 +0000
+++ b/config/target.in	Fri Jun 27 13:58:53 2008 +0000
@@ -2,65 +2,29 @@
 
 menu "Target options"
 
-comment "General target options"
-
 config ARCH
     string
-    default "alpha"   if ARCH_ALPHA
-    default "arm"     if ARCH_ARM
-    default "ia64"    if ARCH_IA64
-    default "mips"    if ARCH_MIPS
-    default "powerpc" if ARCH_PPC
-    default "sh"      if ARCH_SH
-    default "x86"     if ARCH_x86
-    default "x86_64"  if ARCH_x86_64
+
+# Pre-declare target optimisation variables
+config ARCH_ARCH
+config ARCH_ABI
+config ARCH_CPU
+config ARCH_TUNE
+config ARCH_FPU
+config ARCH_SUPPORTS_BOTH_ENDIAN
+config ARCH_DEFAULT_BE
+config ARCH_DEFAULT_LE
+config ARCH_FLOAT_HW
+config ARCH_FLOAT_SW
+config TARGET_CFLAGS
+
+comment "General target options"
 
 choice
     bool
     prompt "Target architecture:"
-    default ARCH_x86
 
-config ARCH_ALPHA
-    bool
-    prompt "alpha (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config ARCH_ARM
-    bool
-    prompt "arm"
-    select ARCH_SUPPORTS_BOTH_ENDIAN
-    select ARCH_DEFAULT_LE
-
-config ARCH_IA64
-    bool
-    prompt "ia64 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-    select ARCH_SUPPORTS_BOTH_ENDIAN
-
-config ARCH_MIPS
-    bool
-    prompt "mips"
-    select ARCH_SUPPORTS_BOTH_ENDIAN
-    select ARCH_DEFAULT_BE
-
-config ARCH_PPC
-    bool
-    prompt "powerpc"
-
-config ARCH_SH
-    bool
-    prompt "sh (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-    select ARCH_SUPPORTS_BOTH_ENDIAN
-    select ARCH_DEFAULT_LE
-
-config ARCH_x86
-    bool
-    prompt "x86"
-
-config ARCH_x86_64
-    bool
-    prompt "x86_64"
+source config.gen/arch.in
 
 endchoice
 
@@ -93,32 +57,6 @@
 
 endchoice
 
-# Include architecture-specific configuration
-if ARCH_ALPHA
-source config/arch/alpha/config.in
-endif
-if ARCH_ARM
-source config/arch/arm/config.in
-endif
-if ARCH_IA64
-source config/arch/ia64/config.in
-endif
-if ARCH_MIPS
-source config/arch/mips/config.in
-endif
-if ARCH_PPC
-source config/arch/powerpc/config.in
-endif
-if ARCH_SH
-source config/arch/sh/config.in
-endif
-if ARCH_x86
-source config/arch/x86/config.in
-endif
-if ARCH_x86_64
-source config/arch/x86_64/config.in
-endif
-
 comment "Target optimisations"
 
 config ARCH_ARCH