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.

Update samples accordingly.

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

30 files changed, 59 insertions, 59 deletions

diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index 9e5b063..a79284e 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -42,51 +42,51 @@ config KERNEL_V_3_7
     bool
     prompt "3.7"
 
-config KERNEL_V_3_6_11
+config KERNEL_V_3_6
     bool
     prompt "3.6.11"
 
-config KERNEL_V_3_5_7
+config KERNEL_V_3_5
     bool
     prompt "3.5.7"
 
-config KERNEL_V_3_4_26
+config KERNEL_V_3_4
     bool
     prompt "3.4.26"
 
-config KERNEL_V_3_3_8
+config KERNEL_V_3_3
     bool
     prompt "3.3.8"
 
-config KERNEL_V_3_2_37
+config KERNEL_V_3_2
     bool
     prompt "3.2.37"
 
-config KERNEL_V_3_1_10
+config KERNEL_V_3_1
     bool
     prompt "3.1.10"
 
-config KERNEL_V_3_0_59
+config KERNEL_V_3_0
     bool
     prompt "3.0.59"
 
-config KERNEL_V_2_6_39_4
+config KERNEL_V_2_6_39
     bool
     prompt "2.6.39.4"
 
-config KERNEL_V_2_6_38_8
+config KERNEL_V_2_6_38
     bool
     prompt "2.6.38.8"
 
-config KERNEL_V_2_6_37_6
+config KERNEL_V_2_6_37
     bool
     prompt "2.6.37.6"
 
-config KERNEL_V_2_6_36_4
+config KERNEL_V_2_6_36
     bool
     prompt "2.6.36.4"
 
-config KERNEL_V_2_6_33_20
+config KERNEL_V_2_6_33
     bool
     prompt "2.6.33.20"
     help
@@ -94,7 +94,7 @@ config KERNEL_V_2_6_33_20
       .33-rt kernel.  Anyone else who really wants to use the .33 kernel tree
       is welcome to use this one as well.
 
-config KERNEL_V_2_6_32_60
+config KERNEL_V_2_6_32
     bool
     prompt "2.6.32.60 (longterm)"
     help
@@ -113,11 +113,11 @@ config KERNEL_V_2_6_32_60
       mailing list entry:
         http://marc.info/?l=linux-kernel&m=126384198403392&w=4
 
-config KERNEL_V_2_6_31_14
+config KERNEL_V_2_6_31
     bool
     prompt "2.6.31.14"
 
-config KERNEL_V_2_6_27_62
+config KERNEL_V_2_6_27
     bool
     prompt "2.6.27.62 (longterm)"
     help
@@ -163,21 +163,21 @@ config KERNEL_VERSION
     default "3.7.2" if KERNEL_V_3_7_2
     default "3.7.1" if KERNEL_V_3_7_1
     default "3.7" if KERNEL_V_3_7
-    default "3.6.11" if KERNEL_V_3_6_11
-    default "3.5.7" if KERNEL_V_3_5_7
-    default "3.4.26" if KERNEL_V_3_4_26
-    default "3.3.8" if KERNEL_V_3_3_8
-    default "3.2.37" if KERNEL_V_3_2_37
-    default "3.1.10" if KERNEL_V_3_1_10
-    default "3.0.59" if KERNEL_V_3_0_59
-    default "2.6.39.4" if KERNEL_V_2_6_39_4
-    default "2.6.38.8" if KERNEL_V_2_6_38_8
-    default "2.6.37.6" if KERNEL_V_2_6_37_6
-    default "2.6.36.4" if KERNEL_V_2_6_36_4
-    default "2.6.33.20" if KERNEL_V_2_6_33_20
-    default "2.6.32.60" if KERNEL_V_2_6_32_60
-    default "2.6.31.14" if KERNEL_V_2_6_31_14
-    default "2.6.27.62" if KERNEL_V_2_6_27_62
+    default "3.6.11" if KERNEL_V_3_6
+    default "3.5.7" if KERNEL_V_3_5
+    default "3.4.26" if KERNEL_V_3_4
+    default "3.3.8" if KERNEL_V_3_3
+    default "3.2.37" if KERNEL_V_3_2
+    default "3.1.10" if KERNEL_V_3_1
+    default "3.0.59" if KERNEL_V_3_0
+    default "2.6.39.4" if KERNEL_V_2_6_39
+    default "2.6.38.8" if KERNEL_V_2_6_38
+    default "2.6.37.6" if KERNEL_V_2_6_37
+    default "2.6.36.4" if KERNEL_V_2_6_36
+    default "2.6.33.20" if KERNEL_V_2_6_33
+    default "2.6.32.60" if KERNEL_V_2_6_32
+    default "2.6.31.14" if KERNEL_V_2_6_31
+    default "2.6.27.62" if KERNEL_V_2_6_27
     default "custom" if KERNEL_LINUX_CUSTOM
 
 endif # ! KERNEL_LINUX_USE_CUSTOM_HEADERS
diff --git a/samples/alphaev56-unknown-linux-gnu/crosstool.config b/samples/alphaev56-unknown-linux-gnu/crosstool.config
index 4bc5ae3..02aa821 100644
--- a/samples/alphaev56-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config
@@ -6,7 +6,7 @@ CT_ARCH_CPU="ev56"
 CT_ARCH_TUNE="ev56"
 CT_ARCH_ALPHA_EV56=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_37_6=y
+CT_KERNEL_V_2_6_37=y
 CT_BINUTILS_V_2_21_1a=y
 CT_BINUTILS_PLUGINS=y
 CT_BINUTILS_FOR_TARGET=y
diff --git a/samples/alphaev67-unknown-linux-gnu/crosstool.config b/samples/alphaev67-unknown-linux-gnu/crosstool.config
index 12954b5..b0e44f2 100644
--- a/samples/alphaev67-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev67-unknown-linux-gnu/crosstool.config
@@ -6,7 +6,7 @@ CT_ARCH_CPU="ev56"
 CT_ARCH_TUNE="ev56"
 CT_ARCH_ALPHA_EV67=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_38_8=y
+CT_KERNEL_V_2_6_38=y
 CT_BINUTILS_V_2_21_1a=y
 CT_CC_V_4_3_5=y
 CT_CC_LANG_FORTRAN=y
diff --git a/samples/arm-cortex_a15-linux-gnueabi/crosstool.config b/samples/arm-cortex_a15-linux-gnueabi/crosstool.config
index 6f6a839..eb0ec5a 100644
--- a/samples/arm-cortex_a15-linux-gnueabi/crosstool.config
+++ b/samples/arm-cortex_a15-linux-gnueabi/crosstool.config
@@ -8,7 +8,7 @@ CT_ARCH_FPU="neon-vfpv4"
 CT_ARCH_arm=y
 CT_TARGET_VENDOR="cortex_a15"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_38_8=y
+CT_KERNEL_V_2_6_38=y
 CT_BINUTILS_V_2_21_1a=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
diff --git a/samples/arm-davinci-linux-gnueabi/crosstool.config b/samples/arm-davinci-linux-gnueabi/crosstool.config
index 824368f..824a597 100644
--- a/samples/arm-davinci-linux-gnueabi/crosstool.config
+++ b/samples/arm-davinci-linux-gnueabi/crosstool.config
@@ -8,7 +8,7 @@ CT_ARCH_FLOAT_SW=y
 CT_ARCH_arm=y
 CT_TARGET_VENDOR="davinci"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_33_20=y
+CT_KERNEL_V_2_6_33=y
 CT_BINUTILS_V_2_20_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_3_2=y
diff --git a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
index bac3fcc..f207cd9 100644
--- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
@@ -8,7 +8,7 @@ CT_ARCH_TUNE="xscale"
 CT_ARCH_FLOAT_SW=y
 CT_ARCH_arm=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_33_20=y
+CT_KERNEL_V_2_6_33=y
 CT_BINUTILS_V_2_19_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_4_3=y
diff --git a/samples/armv6-rpi-linux-gnueabi/crosstool.config b/samples/armv6-rpi-linux-gnueabi/crosstool.config
index d50f4e5..d7c996b 100644
--- a/samples/armv6-rpi-linux-gnueabi/crosstool.config
+++ b/samples/armv6-rpi-linux-gnueabi/crosstool.config
@@ -10,7 +10,7 @@ CT_ARCH_arm=y
 CT_ARCH_SUFFIX="v6"
 CT_TARGET_VENDOR="rpi"
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_6_11=y
+CT_KERNEL_V_3_6=y
 CT_BINUTILS_V_2_22=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
diff --git a/samples/bfin-unknown-linux-uclibc/crosstool.config b/samples/bfin-unknown-linux-uclibc/crosstool.config
index 4956d66..63e8bdd 100644
--- a/samples/bfin-unknown-linux-uclibc/crosstool.config
+++ b/samples/bfin-unknown-linux-uclibc/crosstool.config
@@ -3,7 +3,7 @@ CT_SAVE_TARBALLS=y
 CT_LOG_EXTRA=y
 CT_ARCH_blackfin=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_33_20=y
+CT_KERNEL_V_2_6_33=y
 CT_ARCH_BINFMT_FDPIC=y
 CT_BINUTILS_V_2_20_1a=y
 CT_CC_V_4_3_4=y
diff --git a/samples/i586-geode-linux-uclibc/crosstool.config b/samples/i586-geode-linux-uclibc/crosstool.config
index 9395b89..80c6b8a 100644
--- a/samples/i586-geode-linux-uclibc/crosstool.config
+++ b/samples/i586-geode-linux-uclibc/crosstool.config
@@ -5,7 +5,7 @@ CT_ARCH_ARCH="pentium-mmx"
 CT_ARCH_x86=y
 CT_TARGET_VENDOR="geode"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_36_4=y
+CT_KERNEL_V_2_6_36=y
 CT_BINUTILS_V_2_20_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_4_5=y
diff --git a/samples/i586-mingw32msvc,i686-none-linux-gnu/crosstool.config b/samples/i586-mingw32msvc,i686-none-linux-gnu/crosstool.config
index 517b00e..3de66be 100644
--- a/samples/i586-mingw32msvc,i686-none-linux-gnu/crosstool.config
+++ b/samples/i586-mingw32msvc,i686-none-linux-gnu/crosstool.config
@@ -9,7 +9,7 @@ CT_TARGET_VENDOR="none"
 CT_CANADIAN=y
 CT_HOST="i586-mingw32msvc"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_33_20=y
+CT_KERNEL_V_2_6_33=y
 CT_BINUTILS_V_2_19_1a=y
 CT_BINUTILS_EXTRA_CONFIG_ARRAY="--enable-targets=i686-none-linux-gnu"
 CT_CC_V_4_3_2=y
diff --git a/samples/i686-nptl-linux-gnu/crosstool.config b/samples/i686-nptl-linux-gnu/crosstool.config
index 96359b5..115e7f4 100644
--- a/samples/i686-nptl-linux-gnu/crosstool.config
+++ b/samples/i686-nptl-linux-gnu/crosstool.config
@@ -6,7 +6,7 @@ CT_ARCH_ARCH="i686"
 CT_ARCH_x86=y
 CT_TARGET_VENDOR="nptl"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_36_4=y
+CT_KERNEL_V_2_6_36=y
 CT_BINUTILS_V_2_21_1a=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
diff --git a/samples/m68k-unknown-uclinux-uclibc/crosstool.config b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
index 7b06f6c..6dd27ca 100644
--- a/samples/m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
@@ -4,7 +4,7 @@ CT_SAVE_TARBALLS=y
 CT_LOG_EXTRA=y
 CT_ARCH_m68k=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_5_7=y
+CT_KERNEL_V_3_5=y
 CT_BINUTILS_V_2_21_1a=y
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
 CT_THREADS_LINUXTHREADS=y
diff --git a/samples/mips-ar2315-linux-gnu/crosstool.config b/samples/mips-ar2315-linux-gnu/crosstool.config
index c9a1dc9..244d5fe 100644
--- a/samples/mips-ar2315-linux-gnu/crosstool.config
+++ b/samples/mips-ar2315-linux-gnu/crosstool.config
@@ -8,7 +8,7 @@ CT_ARCH_FLOAT_SW=y
 CT_ARCH_mips=y
 CT_TARGET_VENDOR="ar2315"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_33_20=y
+CT_KERNEL_V_2_6_33=y
 CT_BINUTILS_V_2_19_1a=y
 CT_CC_V_4_3_2=y
 CT_CC_LANG_CXX=y
diff --git a/samples/mips-malta-linux-gnu/crosstool.config b/samples/mips-malta-linux-gnu/crosstool.config
index 775f3db..d8e2133 100644
--- a/samples/mips-malta-linux-gnu/crosstool.config
+++ b/samples/mips-malta-linux-gnu/crosstool.config
@@ -5,7 +5,7 @@ CT_LOG_EXTRA=y
 CT_ARCH_mips=y
 CT_TARGET_VENDOR="malta"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_38_8=y
+CT_KERNEL_V_2_6_38=y
 CT_BINUTILS_V_2_21_1a=y
 CT_CC_V_4_4_6=y
 # CT_CC_GCC_USE_GRAPHITE is not set
diff --git a/samples/mips64el-n32-linux-uclibc/crosstool.config b/samples/mips64el-n32-linux-uclibc/crosstool.config
index df3f7be..9d99772 100644
--- a/samples/mips64el-n32-linux-uclibc/crosstool.config
+++ b/samples/mips64el-n32-linux-uclibc/crosstool.config
@@ -8,7 +8,7 @@ CT_ARCH_FLOAT_SW=y
 CT_ARCH_mips=y
 CT_TARGET_VENDOR="n32"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_31_14=y
+CT_KERNEL_V_2_6_31=y
 CT_BINUTILS_V_2_19_1a=y
 CT_CC_V_4_3_2=y
 CT_CC_LANG_CXX=y
diff --git a/samples/mips64el-n64-linux-uclibc/crosstool.config b/samples/mips64el-n64-linux-uclibc/crosstool.config
index d15e03f..322776a 100644
--- a/samples/mips64el-n64-linux-uclibc/crosstool.config
+++ b/samples/mips64el-n64-linux-uclibc/crosstool.config
@@ -9,7 +9,7 @@ CT_ARCH_mips=y
 CT_ARCH_mips_n64=y
 CT_TARGET_VENDOR="n64"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_31_14=y
+CT_KERNEL_V_2_6_31=y
 CT_BINUTILS_V_2_19_1a=y
 CT_CC_V_4_3_2=y
 CT_CC_LANG_CXX=y
diff --git a/samples/mipsel-unknown-linux-gnu/crosstool.config b/samples/mipsel-unknown-linux-gnu/crosstool.config
index a82ce5c..bb5a083 100644
--- a/samples/mipsel-unknown-linux-gnu/crosstool.config
+++ b/samples/mipsel-unknown-linux-gnu/crosstool.config
@@ -6,7 +6,7 @@ CT_ARCH_LE=y
 CT_ARCH_FLOAT_SW=y
 CT_ARCH_mips=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_31_14=y
+CT_KERNEL_V_2_6_31=y
 CT_BINUTILS_V_2_19_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_3_2=y
diff --git a/samples/powerpc-405-linux-gnu/crosstool.config b/samples/powerpc-405-linux-gnu/crosstool.config
index 0540208..31527ab 100644
--- a/samples/powerpc-405-linux-gnu/crosstool.config
+++ b/samples/powerpc-405-linux-gnu/crosstool.config
@@ -7,7 +7,7 @@ CT_ARCH_FLOAT_SW=y
 CT_ARCH_powerpc=y
 CT_TARGET_VENDOR="405"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_31_14=y
+CT_KERNEL_V_2_6_31=y
 CT_BINUTILS_V_2_19_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_3_2=y
diff --git a/samples/powerpc-860-linux-gnu/crosstool.config b/samples/powerpc-860-linux-gnu/crosstool.config
index 555857f..5764597 100644
--- a/samples/powerpc-860-linux-gnu/crosstool.config
+++ b/samples/powerpc-860-linux-gnu/crosstool.config
@@ -6,7 +6,7 @@ CT_ARCH_FLOAT_SW=y
 CT_ARCH_powerpc=y
 CT_TARGET_VENDOR="860"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_31_14=y
+CT_KERNEL_V_2_6_31=y
 CT_BINUTILS_V_2_19_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_3_2=y
diff --git a/samples/powerpc-e300c3-linux-gnu/crosstool.config b/samples/powerpc-e300c3-linux-gnu/crosstool.config
index 6279414..cc847c7 100644
--- a/samples/powerpc-e300c3-linux-gnu/crosstool.config
+++ b/samples/powerpc-e300c3-linux-gnu/crosstool.config
@@ -6,7 +6,7 @@ CT_ARCH_TUNE="e300c3"
 CT_ARCH_powerpc=y
 CT_TARGET_VENDOR="e300c3"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_36_4=y
+CT_KERNEL_V_2_6_36=y
 CT_BINUTILS_V_2_21_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_5_2=y
diff --git a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
index 94a5a08..b9bcece 100644
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@@ -9,7 +9,7 @@ CT_ARCH_powerpc=y
 CT_ARCH_powerpc_ABI_SPE=y
 CT_TARGET_VENDOR="e500v2"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_36_4=y
+CT_KERNEL_V_2_6_36=y
 CT_BINUTILS_V_2_20_1a=y
 CT_BINUTILS_EXTRA_CONFIG_ARRAY="--enable-spe=yes --enable-e500x2 --with-e500x2"
 CT_BINUTILS_FOR_TARGET=y
diff --git a/samples/powerpc-unknown-linux-gnu/crosstool.config b/samples/powerpc-unknown-linux-gnu/crosstool.config
index 12e0d8c..0e7c180 100644
--- a/samples/powerpc-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown-linux-gnu/crosstool.config
@@ -3,7 +3,7 @@ CT_SAVE_TARBALLS=y
 CT_LOG_EXTRA=y
 CT_ARCH_powerpc=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_31_14=y
+CT_KERNEL_V_2_6_31=y
 CT_BINUTILS_V_2_19_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_3_2=y
diff --git a/samples/powerpc-unknown-linux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc/crosstool.config
index 5557cf7..80ce057 100644
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@@ -4,7 +4,7 @@ CT_LOG_EXTRA=y
 CT_ARCH_FLOAT_SW=y
 CT_ARCH_powerpc=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_31_14=y
+CT_KERNEL_V_2_6_31=y
 CT_BINUTILS_V_2_19_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_2_4=y
diff --git a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
index fa6f462..fee8cb2 100644
--- a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
@@ -5,7 +5,7 @@ CT_ARCH_FLOAT_SW=y
 CT_ARCH_powerpc=y
 CT_TARGET_VENDOR="unknown_nofpu"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_31_14=y
+CT_KERNEL_V_2_6_31=y
 CT_BINUTILS_V_2_19_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_3_2=y
diff --git a/samples/powerpc64-unknown-linux-gnu/crosstool.config b/samples/powerpc64-unknown-linux-gnu/crosstool.config
index 29b9042..1671275 100644
--- a/samples/powerpc64-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config
@@ -5,7 +5,7 @@ CT_LOG_EXTRA=y
 CT_ARCH_64=y
 CT_ARCH_powerpc=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_31_14=y
+CT_KERNEL_V_2_6_31=y
 CT_BINUTILS_V_2_20_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_4_5=y
diff --git a/samples/s390-ibm-linux-gnu/crosstool.config b/samples/s390-ibm-linux-gnu/crosstool.config
index 4f4750b..8306113 100644
--- a/samples/s390-ibm-linux-gnu/crosstool.config
+++ b/samples/s390-ibm-linux-gnu/crosstool.config
@@ -4,7 +4,7 @@ CT_SAVE_TARBALLS=y
 CT_LOG_EXTRA=y
 CT_ARCH_s390=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_31_14=y
+CT_KERNEL_V_2_6_31=y
 CT_BINUTILS_V_2_20_1a=y
 CT_CC_V_4_3_4=y
 CT_CC_LANG_CXX=y
diff --git a/samples/s390x-ibm-linux-gnu/crosstool.config b/samples/s390x-ibm-linux-gnu/crosstool.config
index c34692d..82bc3e0 100644
--- a/samples/s390x-ibm-linux-gnu/crosstool.config
+++ b/samples/s390x-ibm-linux-gnu/crosstool.config
@@ -6,7 +6,7 @@ CT_LOG_EXTRA=y
 CT_ARCH_64=y
 CT_ARCH_s390=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_31_14=y
+CT_KERNEL_V_2_6_31=y
 CT_BINUTILS_V_2_19_1a=y
 CT_CC_V_4_4_5=y
 CT_CC_LANG_CXX=y
diff --git a/samples/sh4-unknown-linux-gnu/crosstool.config b/samples/sh4-unknown-linux-gnu/crosstool.config
index b37ad87..6f93175 100644
--- a/samples/sh4-unknown-linux-gnu/crosstool.config
+++ b/samples/sh4-unknown-linux-gnu/crosstool.config
@@ -5,7 +5,7 @@ CT_LOG_EXTRA=y
 CT_ARCH_sh=y
 CT_ARCH_SH_SH4=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_27_62=y
+CT_KERNEL_V_2_6_27=y
 CT_BINUTILS_V_2_19_1a=y
 CT_CC_V_4_3_2=y
 CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-unknown-linux-gnu/crosstool.config b/samples/x86_64-unknown-linux-gnu/crosstool.config
index 2b263c1..f47353c 100644
--- a/samples/x86_64-unknown-linux-gnu/crosstool.config
+++ b/samples/x86_64-unknown-linux-gnu/crosstool.config
@@ -4,7 +4,7 @@ CT_LOG_EXTRA=y
 CT_ARCH_64=y
 CT_ARCH_x86=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_33_20=y
+CT_KERNEL_V_2_6_33=y
 CT_BINUTILS_V_2_20_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_4_3=y
diff --git a/samples/x86_64-unknown-linux-uclibc/crosstool.config b/samples/x86_64-unknown-linux-uclibc/crosstool.config
index 92e9a20..e429d71 100644
--- a/samples/x86_64-unknown-linux-uclibc/crosstool.config
+++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config
@@ -4,7 +4,7 @@ CT_LOG_EXTRA=y
 CT_ARCH_64=y
 CT_ARCH_x86=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_33_20=y
+CT_KERNEL_V_2_6_33=y
 CT_BINUTILS_V_2_20_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_4_3=y