Run the samples through `ct-ng update-samples`

- Pin sparc-leon-linux-gnu to GCC6, again.
- Remove "brokenness" explanation from moxie-elf comment (was only
applicable to stage-2 compiler, not final).

Signed-off-by: Alexey Neyman <stilor@att.net>

94 files changed, 100 insertions, 22 deletions

diff --git a/samples/aarch64-rpi3-linux-gnu/crosstool.config b/samples/aarch64-rpi3-linux-gnu/crosstool.config
index f8ef63da..e8c429da 100644
--- a/samples/aarch64-rpi3-linux-gnu/crosstool.config
+++ b/samples/aarch64-rpi3-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a53"
 CT_ARCH_64=y
diff --git a/samples/aarch64-unknown-linux-android/crosstool.config b/samples/aarch64-unknown-linux-android/crosstool.config
index 0e8a6f86..4d6a319f 100644
--- a/samples/aarch64-unknown-linux-android/crosstool.config
+++ b/samples/aarch64-unknown-linux-android/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_64=y
@@ -7,4 +8,3 @@ CT_KERNEL_LINUX=y
 CT_ANDROID_API_21=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
-CT_GETTEXT=y
diff --git a/samples/aarch64-unknown-linux-gnu/crosstool.config b/samples/aarch64-unknown-linux-gnu/crosstool.config
index 898e4e4a..864b1002 100644
--- a/samples/aarch64-unknown-linux-gnu/crosstool.config
+++ b/samples/aarch64-unknown-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR=""
diff --git a/samples/aarch64-unknown-linux-uclibc/crosstool.config b/samples/aarch64-unknown-linux-uclibc/crosstool.config
index fdda4498..7c00f7ef 100644
--- a/samples/aarch64-unknown-linux-uclibc/crosstool.config
+++ b/samples/aarch64-unknown-linux-uclibc/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR=""
@@ -11,4 +12,3 @@ CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
 CT_GDB_NATIVE=y
 CT_DEBUG_STRACE=y
-CT_GETTEXT=y
diff --git a/samples/alphaev56-unknown-linux-gnu/crosstool.config b/samples/alphaev56-unknown-linux-gnu/crosstool.config
index 321e957e..ce5688ce 100644
--- a/samples/alphaev56-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ALPHA_EV56=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
diff --git a/samples/alphaev67-unknown-linux-gnu/crosstool.config b/samples/alphaev67-unknown-linux-gnu/crosstool.config
index 485bd2d5..7d27de3f 100644
--- a/samples/alphaev67-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev67-unknown-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ALPHA_EV67=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
diff --git a/samples/arc-arc700-linux-uclibc/crosstool.config b/samples/arc-arc700-linux-uclibc/crosstool.config
index 66a0b52c..c011a930 100644
--- a/samples/arc-arc700-linux-uclibc/crosstool.config
+++ b/samples/arc-arc700-linux-uclibc/crosstool.config
@@ -1,7 +1,8 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARC=y
-CT_TARGET_ALIAS="arc-linux"
+CT_ARCH_CPU="arc700"
 CT_TARGET_CFLAGS="-mno-atomic"
 CT_TARGET_VENDOR="snps"
+CT_TARGET_ALIAS="arc-linux"
 CT_KERNEL_LINUX=y
 CT_LIBC_UCLIBC=y
-CT_ARCH_CPU="arc700"
diff --git a/samples/arc-multilib-elf32/crosstool.config b/samples/arc-multilib-elf32/crosstool.config
index 19e8e89e..975a8c6f 100644
--- a/samples/arc-multilib-elf32/crosstool.config
+++ b/samples/arc-multilib-elf32/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARC=y
 CT_MULTILIB=y
 CT_TARGET_VENDOR="multilib"
diff --git a/samples/arc-multilib-linux-uclibc/crosstool.config b/samples/arc-multilib-linux-uclibc/crosstool.config
index b56c8a8b..ca397c6c 100644
--- a/samples/arc-multilib-linux-uclibc/crosstool.config
+++ b/samples/arc-multilib-linux-uclibc/crosstool.config
@@ -1,7 +1,8 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARC=y
-CT_TARGET_ALIAS="arc-linux"
+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_MULTILIB=y
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 09cae2b2..80810980 100644
--- a/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
+++ b/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-m3"
 CT_ARCH_ARM_MODE_THUMB=y
diff --git a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
index 491046d9..4e304a75 100644
--- a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a15"
 CT_ARCH_FPU="neon-vfpv4"
diff --git a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
index 3e4c024b..7e1dc6fa 100644
--- a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
+++ b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a8"
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
index 49e842ca..a5b25888 100644
--- a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a5"
diff --git a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
index 83f781f4..671d5923 100644
--- a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a9"
diff --git a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
index 6dc39fac..2fc835fe 100644
--- a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_MULTILIB=y
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/arm-nano-eabi/crosstool.config b/samples/arm-nano-eabi/crosstool.config
index 82e57140..ab79b7fd 100644
--- a/samples/arm-nano-eabi/crosstool.config
+++ b/samples/arm-nano-eabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_MULTILIB=y
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/arm-unknown-eabi/crosstool.config b/samples/arm-unknown-eabi/crosstool.config
index f52abecc..2306a07f 100644
--- a/samples/arm-unknown-eabi/crosstool.config
+++ b/samples/arm-unknown-eabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_FLOAT_SW=y
 CT_LIBC_NEWLIB_IO_C99FMT=y
diff --git a/samples/arm-unknown-linux-gnueabi/crosstool.config b/samples/arm-unknown-linux-gnueabi/crosstool.config
index 128d3799..4ffa4af7 100644
--- a/samples/arm-unknown-linux-gnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-gnueabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 # CT_REMOVE_DOCS is not set
 CT_ARCH_ARM=y
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/arm-unknown-linux-musleabi/crosstool.config b/samples/arm-unknown-linux-musleabi/crosstool.config
index c3846110..68b61473 100644
--- a/samples/arm-unknown-linux-musleabi/crosstool.config
+++ b/samples/arm-unknown-linux-musleabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_KERNEL_LINUX=y
diff --git a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
index 2993b995..533d6664 100644
--- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="arm926ej-s"
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
index 3fd2d2d7..53a21379 100644
--- a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_CPU="arm926ej-s"
diff --git a/samples/armeb-unknown-eabi/crosstool.config b/samples/armeb-unknown-eabi/crosstool.config
index c6779f80..561a8550 100644
--- a/samples/armeb-unknown-eabi/crosstool.config
+++ b/samples/armeb-unknown-eabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_BE=y
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/armeb-unknown-linux-gnueabi/crosstool.config b/samples/armeb-unknown-linux-gnueabi/crosstool.config
index 22d7d9f3..83ef15b6 100644
--- a/samples/armeb-unknown-linux-gnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_BE=y
 CT_ARCH_ARCH="armv5te"
diff --git a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
index c2b21f88..fe4c7ec5 100644
--- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="xscale"
 CT_ARCH_BE=y
diff --git a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
index 4b0c04b6..ba08e5d4 100644
--- a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_SUFFIX="v6"
 # CT_ARCH_USE_MMU is not set
@@ -10,4 +11,3 @@ CT_THREADS_NONE=y
 CT_CC_GCC_DISABLE_PCH=y
 CT_CC_GCC_BUILD_ID=y
 CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
-CT_GETTEXT=y
diff --git a/samples/armv6-rpi-linux-gnueabi/crosstool.config b/samples/armv6-rpi-linux-gnueabi/crosstool.config
index 94f1b2a1..eb12a0a1 100644
--- a/samples/armv6-rpi-linux-gnueabi/crosstool.config
+++ b/samples/armv6-rpi-linux-gnueabi/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="arm1176jzf-s"
 CT_ARCH_SUFFIX="v6"
diff --git a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
index 102c5032..51a0e224 100644
--- a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
+++ b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a7"
 CT_ARCH_SUFFIX="v7"
diff --git a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
index fe9b5af1..bc286b8b 100644
--- a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
+++ b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a53"
 CT_ARCH_SUFFIX="v8"
diff --git a/samples/avr/crosstool.config b/samples/avr/crosstool.config
index 6283c78c..dce6af89 100644
--- a/samples/avr/crosstool.config
+++ b/samples/avr/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_AVR=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
diff --git a/samples/i586-geode-linux-uclibc/crosstool.config b/samples/i586-geode-linux-uclibc/crosstool.config
index 08f90f5d..908495af 100644
--- a/samples/i586-geode-linux-uclibc/crosstool.config
+++ b/samples/i586-geode-linux-uclibc/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_X86=y
 CT_ARCH_ARCH="pentium-mmx"
 CT_TARGET_VENDOR="geode"
diff --git a/samples/i686-centos6-linux-gnu/crosstool.config b/samples/i686-centos6-linux-gnu/crosstool.config
index c2858930..2c960e7e 100644
--- a/samples/i686-centos6-linux-gnu/crosstool.config
+++ b/samples/i686-centos6-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
diff --git a/samples/i686-centos7-linux-gnu/crosstool.config b/samples/i686-centos7-linux-gnu/crosstool.config
index 498afcce..9df56e92 100644
--- a/samples/i686-centos7-linux-gnu/crosstool.config
+++ b/samples/i686-centos7-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
diff --git a/samples/i686-nptl-linux-gnu/crosstool.config b/samples/i686-nptl-linux-gnu/crosstool.config
index 48df3304..3e8ed1b2 100644
--- a/samples/i686-nptl-linux-gnu/crosstool.config
+++ b/samples/i686-nptl-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="nptl"
diff --git a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
index 958825d0..6c02470e 100644
--- a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
diff --git a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
index 339c4c69..3778452d 100644
--- a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
diff --git a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
index e7f381eb..2db29172 100644
--- a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
diff --git a/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
index c3df4add..d9f78e44 100644
--- a/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
+++ b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 # CT_REMOVE_DOCS is not set
 CT_ARCH_NIOS2=y
diff --git a/samples/i686-w64-mingw32/crosstool.config b/samples/i686-w64-mingw32/crosstool.config
index 5ed39c09..b92bbe09 100644
--- a/samples/i686-w64-mingw32/crosstool.config
+++ b/samples/i686-w64-mingw32/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
diff --git a/samples/m68k-unknown-elf/crosstool.config b/samples/m68k-unknown-elf/crosstool.config
index 227d45b6..d8edb877 100644
--- a/samples/m68k-unknown-elf/crosstool.config
+++ b/samples/m68k-unknown-elf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_M68K=y
 CT_ARCH_CPU="cpu32"
 CT_ARCH_BINFMT_FLAT=y
diff --git a/samples/m68k-unknown-uclinux-uclibc/crosstool.config b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
index 61c37f18..d8c6267c 100644
--- a/samples/m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_M68K=y
 CT_KERNEL_LINUX=y
 CT_THREADS_LT=y
diff --git a/samples/mips-ar2315-linux-gnu/crosstool.config b/samples/mips-ar2315-linux-gnu/crosstool.config
index f9e79d7e..5a07139d 100644
--- a/samples/mips-ar2315-linux-gnu/crosstool.config
+++ b/samples/mips-ar2315-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_ARCH_TUNE="4kc"
 CT_ARCH_ARCH="4kc"
diff --git a/samples/mips-malta-linux-gnu/crosstool.config b/samples/mips-malta-linux-gnu/crosstool.config
index a0639080..bed4c1bd 100644
--- a/samples/mips-malta-linux-gnu/crosstool.config
+++ b/samples/mips-malta-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_TARGET_VENDOR="malta"
 CT_KERNEL_LINUX=y
diff --git a/samples/mips-unknown-elf/crosstool.config b/samples/mips-unknown-elf/crosstool.config
index 133d27ea..eea2340d 100644
--- a/samples/mips-unknown-elf/crosstool.config
+++ b/samples/mips-unknown-elf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_ARCH_FLOAT_SW=y
 CT_LIBC_NONE=y
diff --git a/samples/mips-unknown-linux-uclibc/crosstool.config b/samples/mips-unknown-linux-uclibc/crosstool.config
index a4cd5ce0..1c1394c4 100644
--- a/samples/mips-unknown-linux-uclibc/crosstool.config
+++ b/samples/mips-unknown-linux-uclibc/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_ARCH_ARCH="mips1"
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/mips64el-multilib-linux-uclibc/crosstool.config b/samples/mips64el-multilib-linux-uclibc/crosstool.config
index faeab875..bec320fd 100644
--- a/samples/mips64el-multilib-linux-uclibc/crosstool.config
+++ b/samples/mips64el-multilib-linux-uclibc/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_MULTILIB=y
 CT_ARCH_LE=y
diff --git a/samples/mipsel-multilib-linux-gnu/crosstool.config b/samples/mipsel-multilib-linux-gnu/crosstool.config
index 9257801c..b1972a95 100644
--- a/samples/mipsel-multilib-linux-gnu/crosstool.config
+++ b/samples/mipsel-multilib-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_MULTILIB=y
 CT_ARCH_LE=y
diff --git a/samples/mipsel-sde-elf/crosstool.config b/samples/mipsel-sde-elf/crosstool.config
index 8e89c90e..86d264dd 100644
--- a/samples/mipsel-sde-elf/crosstool.config
+++ b/samples/mipsel-sde-elf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_ARCH_LE=y
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/mipsel-unknown-linux-gnu/crosstool.config b/samples/mipsel-unknown-linux-gnu/crosstool.config
index 5458b7e7..e9567a94 100644
--- a/samples/mipsel-unknown-linux-gnu/crosstool.config
+++ b/samples/mipsel-unknown-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_ARCH_LE=y
 CT_ARCH_ARCH="mips1"
diff --git a/samples/moxie-unknown-elf/crosstool.config b/samples/moxie-unknown-elf/crosstool.config
index c4457878..2754d89c 100644
--- a/samples/moxie-unknown-elf/crosstool.config
+++ b/samples/moxie-unknown-elf/crosstool.config
@@ -1,6 +1,6 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_MOXIE=y
-CT_LIBC_NEWLIB=y
 CT_DEBUG_GDB=y
 CT_GDB_CROSS_SIM=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/moxie-unknown-elf/reported.by b/samples/moxie-unknown-elf/reported.by
index 907a11fe..13d42a91 100644
--- a/samples/moxie-unknown-elf/reported.by
+++ b/samples/moxie-unknown-elf/reported.by
@@ -1,10 +1,3 @@
 reporter_name="Alexey Neyman"
 reporter_url=""
-reporter_comment="Bare metal configuration for moxie architecture.
-
-It appears to generate a broken toolchain. E.g. newlib's CRT expects
-symbols __bss_start__ and __bss_end__, while linker script generates
-__bss_start (no underscores at the end) and no __bss_end__whatsoever.
-
-This is not a bug in crosstool-NG. If you're interested in saving the
-moxie, please report this upstream."
+reporter_comment="Bare metal configuration for moxie architecture."
diff --git a/samples/moxiebox/crosstool.config b/samples/moxiebox/crosstool.config
index 58fe6533..c0e04e9f 100644
--- a/samples/moxiebox/crosstool.config
+++ b/samples/moxiebox/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_MOXIE=y
 CT_ARCH_LE=y
diff --git a/samples/msp430-unknown-elf/crosstool.config b/samples/msp430-unknown-elf/crosstool.config
index 0443ff13..ed1306f8 100644
--- a/samples/msp430-unknown-elf/crosstool.config
+++ b/samples/msp430-unknown-elf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_MSP430=y
 CT_DEBUG_GDB=y
diff --git a/samples/nios2-altera-linux-gnu/crosstool.config b/samples/nios2-altera-linux-gnu/crosstool.config
index 0b87b577..9ed4455d 100644
--- a/samples/nios2-altera-linux-gnu/crosstool.config
+++ b/samples/nios2-altera-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_NIOS2=y
 CT_ARCH_USE_MMU=y
 CT_TARGET_VENDOR="altera"
diff --git a/samples/nios2-unknown-elf/crosstool.config b/samples/nios2-unknown-elf/crosstool.config
index 16573097..b57f549b 100644
--- a/samples/nios2-unknown-elf/crosstool.config
+++ b/samples/nios2-unknown-elf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_NIOS2=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
diff --git a/samples/powerpc-405-linux-gnu/crosstool.config b/samples/powerpc-405-linux-gnu/crosstool.config
index 0e22d926..691e515f 100644
--- a/samples/powerpc-405-linux-gnu/crosstool.config
+++ b/samples/powerpc-405-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_CPU="405"
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/powerpc-8540-linux-gnu/crosstool.config b/samples/powerpc-8540-linux-gnu/crosstool.config
index 690e9c2c..8019e581 100644
--- a/samples/powerpc-8540-linux-gnu/crosstool.config
+++ b/samples/powerpc-8540-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_CPU="8540"
 # CT_DEMULTILIB is not set
diff --git a/samples/powerpc-860-linux-gnu/crosstool.config b/samples/powerpc-860-linux-gnu/crosstool.config
index 6f1db15b..d03c1496 100644
--- a/samples/powerpc-860-linux-gnu/crosstool.config
+++ b/samples/powerpc-860-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_CPU="860"
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/powerpc-e300c3-linux-gnu/crosstool.config b/samples/powerpc-e300c3-linux-gnu/crosstool.config
index 53ad00c9..dab2b35c 100644
--- a/samples/powerpc-e300c3-linux-gnu/crosstool.config
+++ b/samples/powerpc-e300c3-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_CPU="e300c3"
 CT_TARGET_VENDOR="e300c3"
diff --git a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
index aab2632e..fd3f7e5d 100644
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_CPU="8548"
 CT_ARCH_powerpc_ABI_SPE=y
diff --git a/samples/powerpc-unknown-linux-gnu/crosstool.config b/samples/powerpc-unknown-linux-gnu/crosstool.config
index 29bedbfa..473e76ee 100644
--- a/samples/powerpc-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
diff --git a/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config
index 749e26dd..64183a4a 100644
--- a/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config
@@ -1,7 +1,6 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_M68K=y
 CT_CANADIAN=y
 CT_HOST="powerpc-unknown-linux-uclibc"
 CT_KERNEL_LINUX=y
 CT_THREADS_LT=y
-# CT_LIBICONV is not set
-# CT_GETTEXT is not set
diff --git a/samples/powerpc-unknown-linux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc/crosstool.config
index e0f6dcbb..02b2cb7e 100644
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_FLOAT_SW=y
 CT_KERNEL_LINUX=y
diff --git a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
index b42fa3b3..ac85c967 100644
--- a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="unknown_nofpu"
diff --git a/samples/powerpc64-multilib-linux-gnu/crosstool.config b/samples/powerpc64-multilib-linux-gnu/crosstool.config
index d89a262c..33ffb874 100644
--- a/samples/powerpc64-multilib-linux-gnu/crosstool.config
+++ b/samples/powerpc64-multilib-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_MULTILIB=y
 CT_ARCH_64=y
diff --git a/samples/powerpc64-unknown-linux-gnu/crosstool.config b/samples/powerpc64-unknown-linux-gnu/crosstool.config
index bbe8d5bb..1c628049 100644
--- a/samples/powerpc64-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_64=y
 CT_KERNEL_LINUX=y
diff --git a/samples/powerpc64le-unknown-linux-gnu/crosstool.config b/samples/powerpc64le-unknown-linux-gnu/crosstool.config
index 21b9e8c2..39bd9f08 100644
--- a/samples/powerpc64le-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64le-unknown-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_LE=y
 CT_ARCH_64=y
diff --git a/samples/riscv32-hifive1-elf/crosstool.config b/samples/riscv32-hifive1-elf/crosstool.config
index 18f8870e..0f227168 100644
--- a/samples/riscv32-hifive1-elf/crosstool.config
+++ b/samples/riscv32-hifive1-elf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_RISCV=y
 CT_ARCH_ARCH="rv32ima"
diff --git a/samples/riscv32-unknown-elf/crosstool.config b/samples/riscv32-unknown-elf/crosstool.config
index 22a8f3f0..1adb2a7d 100644
--- a/samples/riscv32-unknown-elf/crosstool.config
+++ b/samples/riscv32-unknown-elf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_RISCV=y
 CT_TARGET_VENDOR=""
diff --git a/samples/riscv64-unknown-elf/crosstool.config b/samples/riscv64-unknown-elf/crosstool.config
index 221ef207..01adfbc6 100644
--- a/samples/riscv64-unknown-elf/crosstool.config
+++ b/samples/riscv64-unknown-elf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_RISCV=y
 # CT_DEMULTILIB is not set
diff --git a/samples/riscv64-unknown-linux-gnu/crosstool.config b/samples/riscv64-unknown-linux-gnu/crosstool.config
index 66c288de..ccfb359f 100644
--- a/samples/riscv64-unknown-linux-gnu/crosstool.config
+++ b/samples/riscv64-unknown-linux-gnu/crosstool.config
@@ -1,12 +1,12 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_RISCV=y
 # CT_DEMULTILIB is not set
 CT_ARCH_USE_MMU=y
 CT_ARCH_64=y
+CT_ARCH_ARCH="rv64gc"
 CT_KERNEL_LINUX=y
 CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 # CT_GDB_GDBSERVER is not set
 CT_ZLIB_NEEDED=y
-CT_TARGET_VENDOR="unknown"
-CT_ARCH_ARCH="rv64gc"
diff --git a/samples/s390-ibm-linux-gnu/crosstool.config b/samples/s390-ibm-linux-gnu/crosstool.config
index 8648aa57..791cc89a 100644
--- a/samples/s390-ibm-linux-gnu/crosstool.config
+++ b/samples/s390-ibm-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_S390=y
 CT_KERNEL_LINUX=y
diff --git a/samples/s390x-ibm-linux-gnu/crosstool.config b/samples/s390x-ibm-linux-gnu/crosstool.config
index 32f06c0d..d036572a 100644
--- a/samples/s390x-ibm-linux-gnu/crosstool.config
+++ b/samples/s390x-ibm-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_S390=y
 CT_ARCH_64=y
 CT_KERNEL_LINUX=y
diff --git a/samples/sh-multilib-linux-gnu/crosstool.config b/samples/sh-multilib-linux-gnu/crosstool.config
index 9fe6e416..9928d928 100644
--- a/samples/sh-multilib-linux-gnu/crosstool.config
+++ b/samples/sh-multilib-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_SH=y
 CT_ARCH_CPU="sh4"
 CT_ARCH_LE_BE=y
diff --git a/samples/sh-multilib-linux-uclibc/crosstool.config b/samples/sh-multilib-linux-uclibc/crosstool.config
index 66caf04f..64a81ae6 100644
--- a/samples/sh-multilib-linux-uclibc/crosstool.config
+++ b/samples/sh-multilib-linux-uclibc/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_SH=y
 CT_ARCH_CPU="sh4"
 CT_ARCH_LE_BE=y
diff --git a/samples/sh-unknown-elf/crosstool.config b/samples/sh-unknown-elf/crosstool.config
index 9387a51a..ad4c43e2 100644
--- a/samples/sh-unknown-elf/crosstool.config
+++ b/samples/sh-unknown-elf/crosstool.config
@@ -1,5 +1,5 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_SH=y
 CT_ARCH_LE_BE=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
-CT_GETTEXT=y
diff --git a/samples/sparc-leon-linux-uclibc/crosstool.config b/samples/sparc-leon-linux-uclibc/crosstool.config
index 20612d8c..2a48273c 100644
--- a/samples/sparc-leon-linux-uclibc/crosstool.config
+++ b/samples/sparc-leon-linux-uclibc/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_SPARC=y
 CT_ARCH_CPU="leon"
 CT_ARCH_TUNE="leon"
@@ -8,7 +9,7 @@ CT_LINUX_V_3_10=y
 CT_LIBC_UCLIBC=y
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}.config"
 CT_LIBC_UCLIBC_IPV6=y
-CT_GCC_V_6_4_0=y
+CT_GCC_V_6_5_0=y
 CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libitm"
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
diff --git a/samples/sparc-unknown-linux-gnu/crosstool.config b/samples/sparc-unknown-linux-gnu/crosstool.config
index 2b225c72..34412864 100644
--- a/samples/sparc-unknown-linux-gnu/crosstool.config
+++ b/samples/sparc-unknown-linux-gnu/crosstool.config
@@ -1,2 +1,3 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_SPARC=y
 CT_KERNEL_LINUX=y
diff --git a/samples/sparc64-multilib-linux-gnu/crosstool.config b/samples/sparc64-multilib-linux-gnu/crosstool.config
index 7ee711f9..ff21d2cf 100644
--- a/samples/sparc64-multilib-linux-gnu/crosstool.config
+++ b/samples/sparc64-multilib-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_SPARC=y
 CT_MULTILIB=y
 CT_ARCH_64=y
diff --git a/samples/x86_64-centos6-linux-gnu/crosstool.config b/samples/x86_64-centos6-linux-gnu/crosstool.config
index 6f0c10ff..68b97471 100644
--- a/samples/x86_64-centos6-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos6-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_64=y
diff --git a/samples/x86_64-centos7-linux-gnu/crosstool.config b/samples/x86_64-centos7-linux-gnu/crosstool.config
index 9d16c9e1..c2d1e3c2 100644
--- a/samples/x86_64-centos7-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos7-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_64=y
diff --git a/samples/x86_64-multilib-linux-gnu/crosstool.config b/samples/x86_64-multilib-linux-gnu/crosstool.config
index 5fc177c4..9923fe14 100644
--- a/samples/x86_64-multilib-linux-gnu/crosstool.config
+++ b/samples/x86_64-multilib-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_X86=y
 CT_MULTILIB=y
 CT_ARCH_64=y
diff --git a/samples/x86_64-multilib-linux-musl/crosstool.config b/samples/x86_64-multilib-linux-musl/crosstool.config
index a24f96f5..9a6291dc 100644
--- a/samples/x86_64-multilib-linux-musl/crosstool.config
+++ b/samples/x86_64-multilib-linux-musl/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_X86=y
 CT_MULTILIB=y
diff --git a/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config b/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config
index b0ce916a..7afd9577 100644
--- a/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config
+++ b/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_MOXIE=y
 CT_CANADIAN=y
diff --git a/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config b/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config
index d5be28f5..db72b5ca 100644
--- a/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config
+++ b/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_TARGET_VENDOR=""
 CT_CANADIAN=y
diff --git a/samples/x86_64-multilib-linux-uclibc/crosstool.config b/samples/x86_64-multilib-linux-uclibc/crosstool.config
index 4e08f7cd..50a96d6c 100644
--- a/samples/x86_64-multilib-linux-uclibc/crosstool.config
+++ b/samples/x86_64-multilib-linux-uclibc/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_X86=y
 CT_MULTILIB=y
 CT_ARCH_64=y
diff --git a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
index f71ad6da..6b0c0787 100644
--- a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_64=y
diff --git a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
index e7bfcd3d..ecaac958 100644
--- a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_64=y
diff --git a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
index 2a7fc1d2..fdc59fbc 100644
--- a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_64=y
diff --git a/samples/x86_64-unknown-linux-gnu/crosstool.config b/samples/x86_64-unknown-linux-gnu/crosstool.config
index c3518a17..66547b02 100644
--- a/samples/x86_64-unknown-linux-gnu/crosstool.config
+++ b/samples/x86_64-unknown-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_X86=y
 CT_ARCH_64=y
 CT_KERNEL_LINUX=y
diff --git a/samples/x86_64-unknown-linux-uclibc/crosstool.config b/samples/x86_64-unknown-linux-uclibc/crosstool.config
index 6b2eb170..945996cb 100644
--- a/samples/x86_64-unknown-linux-uclibc/crosstool.config
+++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_X86=y
 CT_ARCH_64=y
 CT_KERNEL_LINUX=y
diff --git a/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config
index 2fc67d97..a49e56f6 100644
--- a/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config
+++ b/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a9"
diff --git a/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config b/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config
index f10a91ac..78aa8083 100644
--- a/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config
+++ b/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 # CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES is not set
 CT_ARCH_X86=y
diff --git a/samples/x86_64-w64-mingw32/crosstool.config b/samples/x86_64-w64-mingw32/crosstool.config
index eda9c67b..7157afed 100644
--- a/samples/x86_64-w64-mingw32/crosstool.config
+++ b/samples/x86_64-w64-mingw32/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_X86=y
 CT_MULTILIB=y
diff --git a/samples/xtensa-fsf-linux-uclibc/crosstool.config b/samples/xtensa-fsf-linux-uclibc/crosstool.config
index 92f03889..33433d9a 100644
--- a/samples/xtensa-fsf-linux-uclibc/crosstool.config
+++ b/samples/xtensa-fsf-linux-uclibc/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_XTENSA=y
 CT_ARCH_BE=y
 CT_TARGET_CFLAGS="-mlongcalls -mtext-section-literals"