diff -r d4b4efd6536e -r 239ea86a47f6 config/cc/gcc.in
--- a/config/cc/gcc.in	Fri Jan 18 14:47:44 2013 +0100
+++ b/config/cc/gcc.in	Thu Jan 24 22:21:19 2013 +0100
@@ -36,7 +36,7 @@
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
-config CC_V_linaro_4_7_2013_01
+config CC_V_linaro_4_7
     bool
     prompt "linaro-4.7-2013.01"
     depends on CC_GCC_SHOW_LINARO
@@ -57,7 +57,7 @@
     prompt "4.7.0"
     select CC_GCC_4_7
 
-config CC_V_linaro_4_6_2013_01
+config CC_V_linaro_4_6
     bool
     prompt "linaro-4.6-2013.01"
     depends on CC_GCC_SHOW_LINARO
@@ -83,7 +83,7 @@
     prompt "4.6.0"
     select CC_GCC_4_6
 
-config CC_V_linaro_4_5_2012_03
+config CC_V_linaro_4_5
     bool
     prompt "linaro-4.5-2012.03"
     depends on CC_GCC_SHOW_LINARO
@@ -110,7 +110,7 @@
     select CC_GCC_4_5
 
 
-config CC_V_linaro_4_4_2011_02_0
+config CC_V_linaro_4_4
     bool
     prompt "linaro-4.4-2011.02-0"
     depends on CC_GCC_SHOW_LINARO
@@ -381,21 +381,21 @@
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
-    default "linaro-4.7-2013.01" if CC_V_linaro_4_7_2013_01
+    default "linaro-4.7-2013.01" if CC_V_linaro_4_7
     default "4.7.2" if CC_V_4_7_2
     default "4.7.1" if CC_V_4_7_1
     default "4.7.0" if CC_V_4_7_0
-    default "linaro-4.6-2013.01" if CC_V_linaro_4_6_2013_01
+    default "linaro-4.6-2013.01" if CC_V_linaro_4_6
     default "4.6.3" if CC_V_4_6_3
     default "4.6.2" if CC_V_4_6_2
     default "4.6.1" if CC_V_4_6_1
     default "4.6.0" if CC_V_4_6_0
-    default "linaro-4.5-2012.03" if CC_V_linaro_4_5_2012_03
+    default "linaro-4.5-2012.03" if CC_V_linaro_4_5
     default "4.5.3" if CC_V_4_5_3
     default "4.5.2" if CC_V_4_5_2
     default "4.5.1" if CC_V_4_5_1
     default "4.5.0" if CC_V_4_5_0
-    default "linaro-4.4-2011.02-0" if CC_V_linaro_4_4_2011_02_0
+    default "linaro-4.4-2011.02-0" if CC_V_linaro_4_4
     default "4.4.7" if CC_V_4_4_7
     default "4.4.6" if CC_V_4_4_6
     default "4.4.5" if CC_V_4_4_5