samples: update samples for release

Refresh all samples against the new set of options, to be
sure they all build OK, before we can do the release.

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

8 files changed, 2 insertions, 9 deletions

diff --git a/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config b/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
index 2bebac8e..8ef704cb 100644
--- a/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
+++ b/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
@@ -13,8 +13,7 @@ CT_ARCH_BINFMT_FLAT=y
 CT_BINUTILS_V_2_19_1a=y
 CT_CC_V_4_4_1=y
 CT_CC_LANG_CXX=y
-CT_LIBC_VERSION="newlib-1_18_0"
-CT_LIBC_NEWLIB_CVS=y
+CT_LIBC_NEWLIB_V_1_18_0=y
 CT_GMP_V_4_3_2=y
 CT_MPFR_V_2_4_2=y
 CT_PPL_V_0_10_2=y
diff --git a/samples/arm-cortex_a15-linux-gnueabi/crosstool.config b/samples/arm-cortex_a15-linux-gnueabi/crosstool.config
index 7600c3a6..6f6a8391 100644
--- a/samples/arm-cortex_a15-linux-gnueabi/crosstool.config
+++ b/samples/arm-cortex_a15-linux-gnueabi/crosstool.config
@@ -14,7 +14,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_CC_GCC_SHOW_LINARO=y
-CT_CC_V_linaro_4_6_2012_04=y
 CT_CC_LANG_FORTRAN=y
 CT_CC_LANG_CXX=y
 CT_CC_CORE_EXTRA_CONFIG_ARRAY="--with-float=hard"
diff --git a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
index 1a91b88e..cfabba00 100644
--- a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
+++ b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
@@ -8,7 +8,6 @@ CT_ARCH_FLOAT_SW=y
 CT_ARCH_arm=y
 CT_TARGET_VENDOR="cortex_a8"
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_0_30=y
 CT_BINUTILS_V_2_20_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_4_6=y
diff --git a/samples/arm-unknown-linux-gnueabi/crosstool.config b/samples/arm-unknown-linux-gnueabi/crosstool.config
index 93cb772f..24e891cc 100644
--- a/samples/arm-unknown-linux-gnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-gnueabi/crosstool.config
@@ -5,7 +5,6 @@ CT_LOG_EXTRA=y
 CT_ARCH_FLOAT_SW=y
 CT_ARCH_arm=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_0_30=y
 CT_BINUTILS_V_2_19_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_3_2=y
diff --git a/samples/armeb-unknown-linux-gnueabi/crosstool.config b/samples/armeb-unknown-linux-gnueabi/crosstool.config
index 7294b22e..7b019fba 100644
--- a/samples/armeb-unknown-linux-gnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config
@@ -9,7 +9,6 @@ CT_ARCH_BE=y
 CT_ARCH_FLOAT_SW=y
 CT_ARCH_arm=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_0_30=y
 CT_BINUTILS_V_2_20_1a=y
 CT_BINUTILS_FOR_TARGET=y
 CT_CC_V_4_4_3=y
diff --git a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
index 28f23bf9..a93b7485 100644
--- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
@@ -9,7 +9,6 @@ CT_ARCH_BE=y
 CT_ARCH_FLOAT_SW=y
 CT_ARCH_arm=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_0_30=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 3316c323..7b06f6c5 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_BINUTILS_V_2_21_1a=y
-CT_CC_V_4_7_2=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-unknown-linux-uclibc/crosstool.config b/samples/mips-unknown-linux-uclibc/crosstool.config
index 8d868ec8..72051d40 100644
--- a/samples/mips-unknown-linux-uclibc/crosstool.config
+++ b/samples/mips-unknown-linux-uclibc/crosstool.config
@@ -6,7 +6,6 @@ CT_ARCH_ARCH="mips1"
 CT_ARCH_FLOAT_SW=y
 CT_ARCH_mips=y
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_0_30=y
 CT_BINUTILS_V_2_21_1a=y
 CT_CC_V_4_6_1=y
 CT_CC_LANG_FORTRAN=y