From 0571b39a81ef4c1188f0bdd78f050720de13c40b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@free.fr>
Date: Thu, 24 Jan 2013 22:21:19 +0100
Subject: cc/gcc: remove 'sub-level' version form symbols

Now we use defconfig files to store the samples, we have to be a bit more
conservatives in the symbols names, so as to avoid gigantic version bumps
when updating sub-level versions from a package.

For example (using fictitious versions):
  - in crosstool-NG 1.17.0, we choose:
    - latest gcc is gcc-linaro-4.7-2012.10, which is the default for the
      choice in the menuconfig
    - gcc-linaro-4.6-2012.10 is selected
    - so, sample has an explicit symbol for the selected gcc version, as it
      is not the default
  - we update to crosstool-NG 1.18.0:
    - latest gcc version is gcc-linaro-4.7-2013.01
    - gcc-linaro-46 has been updated to gcc-linaro-4.6-2013.01
    - as the sample now has no *valid* symbol to set the gcc version, the
      default is used, while we would have expected to still use the 4.6
      release from linaro, not the 4.7

Get rid of sub-level (ie. the third digit sequence in versions) from the
symbols for linaro versions.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index f6a58d2..9b33ece 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -36,7 +36,7 @@ choice
 # 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 @@ config CC_V_4_7_0
     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 @@ config CC_V_4_6_0
     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 @@ config CC_V_4_5_0
     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 @@ config CC_VERSION
     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
-- 
cgit v0.10.2-6-g49f6