8 files changed, 14 insertions, 14 deletions
diff --git a/samples/arc-arc700-linux-uclibc/crosstool.config b/samples/arc-arc700-linux-uclibc/crosstool.config
index caa0cf1..93305e5 100644
--- a/samples/arc-arc700-linux-uclibc/crosstool.config
+++ b/samples/arc-arc700-linux-uclibc/crosstool.config
@@ -1,8 +1,8 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARC=y
 CT_ARCH_CPU="arc700"
 CT_TARGET_CFLAGS="-mno-atomic"
-CT_TARGET_VENDOR="snps"
+CT_TARGET_VENDOR="arc700"
 CT_TARGET_ALIAS="arc-linux"
 CT_KERNEL_LINUX=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
diff --git a/samples/arc-archs-linux-gnu/crosstool.config b/samples/arc-archs-linux-gnu/crosstool.config
index ad39f70..dfeb1ed 100644
--- a/samples/arc-archs-linux-gnu/crosstool.config
+++ b/samples/arc-archs-linux-gnu/crosstool.config
@@ -1,6 +1,6 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARC=y
 CT_ARCH_CPU="archs"
-CT_TARGET_VENDOR="snps"
+CT_TARGET_VENDOR="archs"
 CT_TARGET_ALIAS="arc-linux"
 CT_KERNEL_LINUX=y
diff --git a/samples/arc-multilib-elf32/crosstool.config b/samples/arc-multilib-elf32/crosstool.config
index 0cc3cdd..e2bce98 100644
--- a/samples/arc-multilib-elf32/crosstool.config
+++ b/samples/arc-multilib-elf32/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARC=y
 CT_MULTILIB=y
 CT_TARGET_VENDOR="multilib"
diff --git a/samples/arc-multilib-linux-gnu/crosstool.config b/samples/arc-multilib-linux-gnu/crosstool.config
index 3dc7802..b32c92e 100644
--- a/samples/arc-multilib-linux-gnu/crosstool.config
+++ b/samples/arc-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARC=y
 CT_MULTILIB=y
 CT_TARGET_CFLAGS="-matomic"
diff --git a/samples/arc-multilib-linux-uclibc/crosstool.config b/samples/arc-multilib-linux-uclibc/crosstool.config
index b1862a5..16b7569 100644
--- a/samples/arc-multilib-linux-uclibc/crosstool.config
+++ b/samples/arc-multilib-linux-uclibc/crosstool.config
@@ -1,8 +1,8 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARC=y
 CT_MULTILIB=y
 CT_TARGET_CFLAGS="-matomic"
 CT_TARGET_VENDOR="multilib"
 CT_TARGET_ALIAS="arc-linux"
 CT_KERNEL_LINUX=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
diff --git a/samples/i686-centos6-linux-gnu/crosstool.config b/samples/i686-centos6-linux-gnu/crosstool.config
index cb7f713..ffdb905 100644
--- a/samples/i686-centos6-linux-gnu/crosstool.config
+++ b/samples/i686-centos6-linux-gnu/crosstool.config
@@ -4,7 +4,5 @@ CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="centos6"
 CT_KERNEL_LINUX=y
-CT_LINUX_V_2_6_32=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_GLIBC_V_2_12_2=y
 CT_CC_LANG_CXX=y
diff --git a/samples/samples.mk b/samples/samples.mk
index 48bbbb9..51e9619 100644
--- a/samples/samples.mk
+++ b/samples/samples.mk
@@ -128,7 +128,7 @@ samples:
 
 # Save a sample
 saveconfig: .config samples
-	$(SILENT)CT_VCHECK=save CONF=$(CONF) $(bash) $(CT_LIB_DIR)/scripts/saveSample.sh
+	$(SILENT)CONF=$(CONF) $(bash) $(CT_LIB_DIR)/scripts/saveSample.sh
 
 # The 'sample_dir' function prints the directory in which the sample is,
 # searching first in local samples, then in global samples
diff --git a/samples/x86_64-centos6-linux-gnu/crosstool.config b/samples/x86_64-centos6-linux-gnu/crosstool.config
index 24e8a11..e9747cd 100644
--- a/samples/x86_64-centos6-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos6-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_64=y
@@ -6,5 +6,7 @@ CT_TARGET_VENDOR="centos6"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_2_6_32=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_GLIBC_V_2_12_2=y
+CT_GLIBC_V_2_12_1=y
+CT_GLIBC_EXTRA_CFLAGS=""
+# CT_GLIBC_ENABLE_COMMON_FLAG is not set
 CT_CC_LANG_CXX=y