diff -r d4ac8609878e -r b6faa28e76e0 config/target.in
--- a/config/target.in	Mon Nov 14 19:13:00 2011 +0100
+++ b/config/target.in	Wed Nov 30 00:25:22 2011 +0100
@@ -10,12 +10,12 @@
 config ARCH_SUPPORTS_BOTH_ENDIAN
 config ARCH_SUPPORTS_32
 config ARCH_SUPPORTS_64
-config ARCH_SUPPORT_ARCH
-config ARCH_SUPPORT_ABI
-config ARCH_SUPPORT_CPU
-config ARCH_SUPPORT_TUNE
-config ARCH_SUPPORT_FPU
-config ARCH_SUPPORT_SOFTFP
+config ARCH_SUPPORTS_WITH_ARCH
+config ARCH_SUPPORTS_WITH_ABI
+config ARCH_SUPPORTS_WITH_CPU
+config ARCH_SUPPORTS_WITH_TUNE
+config ARCH_SUPPORTS_WITH_FPU
+config ARCH_SUPPORTS_SOFTFP
 
 config ARCH_DEFAULT_HAS_MMU
 config ARCH_DEFAULT_BE
@@ -136,28 +136,28 @@
 #--------------------------------------
 comment "Target optimisations"
 
-config ARCH_SUPPORT_ARCH
+config ARCH_SUPPORTS_WITH_ARCH
     bool
 
-config ARCH_SUPPORT_ABI
+config ARCH_SUPPORTS_WITH_ABI
     bool
 
-config ARCH_SUPPORT_CPU
+config ARCH_SUPPORTS_WITH_CPU
     bool
 
-config ARCH_SUPPORT_TUNE
+config ARCH_SUPPORTS_WITH_TUNE
     bool
 
-config ARCH_SUPPORT_FPU
+config ARCH_SUPPORTS_WITH_FPU
     bool
 
-config ARCH_SUPPORT_SOFTFP
+config ARCH_SUPPORTS_SOFTFP
     bool
 
 config ARCH_ARCH
     string
     prompt "Architecture level"
-    depends on ARCH_SUPPORT_ARCH
+    depends on ARCH_SUPPORTS_WITH_ARCH
     default ""
     help
       GCC uses this name to determine what kind of instructions it can emit
@@ -177,7 +177,7 @@
 config ARCH_ABI
     string
     prompt "Generate code for the specific ABI"
-    depends on ARCH_SUPPORT_ABI
+    depends on ARCH_SUPPORTS_WITH_ABI
     default ""
     help
       Generate code for the given ABI.
@@ -194,7 +194,7 @@
 config ARCH_CPU
     string
     prompt "Emit assembly for CPU"
-    depends on ARCH_SUPPORT_CPU
+    depends on ARCH_SUPPORTS_WITH_CPU
     default ""
     help
       This specifies the name of the target processor. GCC uses this name
@@ -213,7 +213,7 @@
 config ARCH_TUNE
     string
     prompt "Tune for CPU"
-    depends on ARCH_SUPPORT_TUNE
+    depends on ARCH_SUPPORTS_WITH_TUNE
     default ""
     help
       This option is very similar to the ARCH_CPU option (above), except
@@ -236,7 +236,7 @@
 config ARCH_FPU
     string
     prompt "Use specific FPU"
-    depends on ARCH_SUPPORT_FPU
+    depends on ARCH_SUPPORTS_WITH_FPU
     default ""
     help
       On some targets (eg. ARM), you can specify the kind of FPU to emit
@@ -284,7 +284,7 @@
 config ARCH_FLOAT_SOFTFP
     bool
     prompt "softfp"
-    depends on ARCH_SUPPORT_SOFTFP
+    depends on ARCH_SUPPORTS_SOFTFP
     help
       Emit hardware floating point opcodes but use the software
       floating point calling convention.