1.1 --- a/config/cc/gcc.in	Fri Jan 18 14:47:44 2013 +0100
     1.2 +++ b/config/cc/gcc.in	Thu Jan 24 22:21:19 2013 +0100
     1.3 @@ -36,7 +36,7 @@
     1.4  # Don't remove next line
     1.5  # CT_INSERT_VERSION_BELOW
     1.6  
     1.7 -config CC_V_linaro_4_7_2013_01
     1.8 +config CC_V_linaro_4_7
     1.9      bool
    1.10      prompt "linaro-4.7-2013.01"
    1.11      depends on CC_GCC_SHOW_LINARO
    1.12 @@ -57,7 +57,7 @@
    1.13      prompt "4.7.0"
    1.14      select CC_GCC_4_7
    1.15  
    1.16 -config CC_V_linaro_4_6_2013_01
    1.17 +config CC_V_linaro_4_6
    1.18      bool
    1.19      prompt "linaro-4.6-2013.01"
    1.20      depends on CC_GCC_SHOW_LINARO
    1.21 @@ -83,7 +83,7 @@
    1.22      prompt "4.6.0"
    1.23      select CC_GCC_4_6
    1.24  
    1.25 -config CC_V_linaro_4_5_2012_03
    1.26 +config CC_V_linaro_4_5
    1.27      bool
    1.28      prompt "linaro-4.5-2012.03"
    1.29      depends on CC_GCC_SHOW_LINARO
    1.30 @@ -110,7 +110,7 @@
    1.31      select CC_GCC_4_5
    1.32  
    1.33  
    1.34 -config CC_V_linaro_4_4_2011_02_0
    1.35 +config CC_V_linaro_4_4
    1.36      bool
    1.37      prompt "linaro-4.4-2011.02-0"
    1.38      depends on CC_GCC_SHOW_LINARO
    1.39 @@ -381,21 +381,21 @@
    1.40      string
    1.41  # Don't remove next line
    1.42  # CT_INSERT_VERSION_STRING_BELOW
    1.43 -    default "linaro-4.7-2013.01" if CC_V_linaro_4_7_2013_01
    1.44 +    default "linaro-4.7-2013.01" if CC_V_linaro_4_7
    1.45      default "4.7.2" if CC_V_4_7_2
    1.46      default "4.7.1" if CC_V_4_7_1
    1.47      default "4.7.0" if CC_V_4_7_0
    1.48 -    default "linaro-4.6-2013.01" if CC_V_linaro_4_6_2013_01
    1.49 +    default "linaro-4.6-2013.01" if CC_V_linaro_4_6
    1.50      default "4.6.3" if CC_V_4_6_3
    1.51      default "4.6.2" if CC_V_4_6_2
    1.52      default "4.6.1" if CC_V_4_6_1
    1.53      default "4.6.0" if CC_V_4_6_0
    1.54 -    default "linaro-4.5-2012.03" if CC_V_linaro_4_5_2012_03
    1.55 +    default "linaro-4.5-2012.03" if CC_V_linaro_4_5
    1.56      default "4.5.3" if CC_V_4_5_3
    1.57      default "4.5.2" if CC_V_4_5_2
    1.58      default "4.5.1" if CC_V_4_5_1
    1.59      default "4.5.0" if CC_V_4_5_0
    1.60 -    default "linaro-4.4-2011.02-0" if CC_V_linaro_4_4_2011_02_0
    1.61 +    default "linaro-4.4-2011.02-0" if CC_V_linaro_4_4
    1.62      default "4.4.7" if CC_V_4_4_7
    1.63      default "4.4.6" if CC_V_4_4_6
    1.64      default "4.4.5" if CC_V_4_4_5