diff -r d031a67fc494 -r d4ddf19a1968 config/cc/gcc.in
--- a/config/cc/gcc.in	Wed Aug 19 19:52:04 2009 +0200
+++ b/config/cc/gcc.in	Sun Sep 13 17:51:33 2009 +0200
@@ -17,104 +17,12 @@
     bool
     prompt "gcc version"
 
-config CC_V_3_2_3
+config CC_V_4_4_1
     bool
-    prompt "3.2.3 (OBSOLETE)"
-    depends on OBSOLETE
-
-config CC_V_3_3_6
-    bool
-    prompt "3.3.6 (OBSOLETE)"
-    depends on OBSOLETE
-
-config CC_V_3_4_6
-    bool
-    prompt "3.4.6 (OBSOLETE)"
-    depends on OBSOLETE
-
-config CC_V_4_0_0
-    bool
-    prompt "4.0.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config CC_V_4_0_1
-    bool
-    prompt "4.0.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config CC_V_4_0_2
-    bool
-    prompt "4.0.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config CC_V_4_0_3
-    bool
-    prompt "4.0.3 (OBSOLETE)"
-    depends on OBSOLETE
-
-config CC_V_4_0_4
-    bool
-    prompt "4.0.4"
-
-config CC_V_4_1_0
-    bool
-    prompt "4.1.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config CC_V_4_1_1
-    bool
-    prompt "4.1.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config CC_V_4_1_2
-    bool
-    prompt "4.1.2"
-
-config CC_V_4_2_0
-    bool
-    prompt "4.2.0"
-
-config CC_V_4_2_1
-    bool
-    prompt "4.2.1"
-
-config CC_V_4_2_2
-    bool
-    prompt "4.2.2"
-
-config CC_V_4_2_3
-    bool
-    prompt "4.2.3"
-
-config CC_V_4_2_4
-    bool
-    prompt "4.2.4"
-
-config CC_V_4_3_0
-    bool
-    prompt "4.3.0 (EXPERIMENTAL)"
+    prompt "4.4.1  (EXPERIMENTAL)"
     depends on EXPERIMENTAL
     select CC_GCC_4_3_or_later
-
-config CC_V_4_3_1
-    bool
-    prompt "4.3.1"
-    select CC_GCC_4_3_or_later
-
-config CC_V_4_3_2
-    bool
-    prompt "4.3.2"
-    select CC_GCC_4_3_or_later
-
-config CC_V_4_3_3
-    bool
-    prompt "4.3.3"
-    select CC_GCC_4_3_or_later
-
-config CC_V_4_3_4
-    bool
-    prompt "4.3.4"
-    select CC_GCC_4_3_or_later
+    select CC_GCC_4_4_or_later
 
 config CC_V_4_4_0
     bool
@@ -123,12 +31,104 @@
     select CC_GCC_4_3_or_later
     select CC_GCC_4_4_or_later
 
-config CC_V_4_4_1
+config CC_V_4_3_4
     bool
-    prompt "4.4.1  (EXPERIMENTAL)"
+    prompt "4.3.4"
+    select CC_GCC_4_3_or_later
+
+config CC_V_4_3_3
+    bool
+    prompt "4.3.3"
+    select CC_GCC_4_3_or_later
+
+config CC_V_4_3_2
+    bool
+    prompt "4.3.2"
+    select CC_GCC_4_3_or_later
+
+config CC_V_4_3_1
+    bool
+    prompt "4.3.1"
+    select CC_GCC_4_3_or_later
+
+config CC_V_4_3_0
+    bool
+    prompt "4.3.0 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
     select CC_GCC_4_3_or_later
-    select CC_GCC_4_4_or_later
+
+config CC_V_4_2_4
+    bool
+    prompt "4.2.4"
+
+config CC_V_4_2_3
+    bool
+    prompt "4.2.3"
+
+config CC_V_4_2_2
+    bool
+    prompt "4.2.2"
+
+config CC_V_4_2_1
+    bool
+    prompt "4.2.1"
+
+config CC_V_4_2_0
+    bool
+    prompt "4.2.0"
+
+config CC_V_4_1_2
+    bool
+    prompt "4.1.2"
+
+config CC_V_4_1_1
+    bool
+    prompt "4.1.1 (OBSOLETE)"
+    depends on OBSOLETE
+
+config CC_V_4_1_0
+    bool
+    prompt "4.1.0 (OBSOLETE)"
+    depends on OBSOLETE
+
+config CC_V_4_0_4
+    bool
+    prompt "4.0.4"
+
+config CC_V_4_0_3
+    bool
+    prompt "4.0.3 (OBSOLETE)"
+    depends on OBSOLETE
+
+config CC_V_4_0_2
+    bool
+    prompt "4.0.2 (OBSOLETE)"
+    depends on OBSOLETE
+
+config CC_V_4_0_1
+    bool
+    prompt "4.0.1 (OBSOLETE)"
+    depends on OBSOLETE
+
+config CC_V_4_0_0
+    bool
+    prompt "4.0.0 (OBSOLETE)"
+    depends on OBSOLETE
+
+config CC_V_3_4_6
+    bool
+    prompt "3.4.6 (OBSOLETE)"
+    depends on OBSOLETE
+
+config CC_V_3_3_6
+    bool
+    prompt "3.3.6 (OBSOLETE)"
+    depends on OBSOLETE
+
+config CC_V_3_2_3
+    bool
+    prompt "3.2.3 (OBSOLETE)"
+    depends on OBSOLETE
 
 # CT_INSERT_VERSION_ABOVE
 # Don't remove above line!
@@ -146,29 +146,29 @@
 
 config CC_VERSION
     string
+    default "4.4.1" if CC_V_4_4_1
+    default "4.4.0" if CC_V_4_4_0
+    default "4.3.4" if CC_V_4_3_4
+    default "4.3.3" if CC_V_4_3_3
+    default "4.3.2" if CC_V_4_3_2
+    default "4.3.1" if CC_V_4_3_1
+    default "4.3.0" if CC_V_4_3_0
+    default "4.2.4" if CC_V_4_2_4
+    default "4.2.3" if CC_V_4_2_3
+    default "4.2.2" if CC_V_4_2_2
+    default "4.2.1" if CC_V_4_2_1
+    default "4.2.0" if CC_V_4_2_0
+    default "4.1.2" if CC_V_4_1_2
+    default "4.1.1" if CC_V_4_1_1
+    default "4.1.0" if CC_V_4_1_0
+    default "4.0.4" if CC_V_4_0_4
+    default "4.0.3" if CC_V_4_0_3
+    default "4.0.2" if CC_V_4_0_2
+    default "4.0.1" if CC_V_4_0_1
+    default "4.0.0" if CC_V_4_0_0
+    default "3.4.6" if CC_V_3_4_6
+    default "3.3.6" if CC_V_3_3_6
     default "3.2.3" if CC_V_3_2_3
-    default "3.3.6" if CC_V_3_3_6
-    default "3.4.6" if CC_V_3_4_6
-    default "4.0.0" if CC_V_4_0_0
-    default "4.0.1" if CC_V_4_0_1
-    default "4.0.2" if CC_V_4_0_2
-    default "4.0.3" if CC_V_4_0_3
-    default "4.0.4" if CC_V_4_0_4
-    default "4.1.0" if CC_V_4_1_0
-    default "4.1.1" if CC_V_4_1_1
-    default "4.1.2" if CC_V_4_1_2
-    default "4.2.0" if CC_V_4_2_0
-    default "4.2.1" if CC_V_4_2_1
-    default "4.2.2" if CC_V_4_2_2
-    default "4.2.3" if CC_V_4_2_3
-    default "4.2.4" if CC_V_4_2_4
-    default "4.3.0" if CC_V_4_3_0
-    default "4.3.1" if CC_V_4_3_1
-    default "4.3.2" if CC_V_4_3_2
-    default "4.3.3" if CC_V_4_3_3
-    default "4.3.4" if CC_V_4_3_4
-    default "4.4.0" if CC_V_4_4_0
-    default "4.4.1" if CC_V_4_4_1
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!