summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--samples/aarch64-rpi3-linux-gnu/crosstool.config1
-rw-r--r--samples/aarch64-unknown-linux-android/crosstool.config2
-rw-r--r--samples/aarch64-unknown-linux-gnu/crosstool.config1
-rw-r--r--samples/aarch64-unknown-linux-uclibc/crosstool.config2
-rw-r--r--samples/alphaev56-unknown-linux-gnu/crosstool.config1
-rw-r--r--samples/alphaev67-unknown-linux-gnu/crosstool.config1
-rw-r--r--samples/arc-arc700-linux-uclibc/crosstool.config5
-rw-r--r--samples/arc-multilib-elf32/crosstool.config1
-rw-r--r--samples/arc-multilib-linux-uclibc/crosstool.config5
-rw-r--r--samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config1
-rw-r--r--samples/arm-cortex_a15-linux-gnueabihf/crosstool.config1
-rw-r--r--samples/arm-cortex_a8-linux-gnueabi/crosstool.config1
-rw-r--r--samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config1
-rw-r--r--samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config1
-rw-r--r--samples/arm-multilib-linux-uclibcgnueabi/crosstool.config1
-rw-r--r--samples/arm-nano-eabi/crosstool.config1
-rw-r--r--samples/arm-unknown-eabi/crosstool.config1
-rw-r--r--samples/arm-unknown-linux-gnueabi/crosstool.config1
-rw-r--r--samples/arm-unknown-linux-musleabi/crosstool.config1
-rw-r--r--samples/arm-unknown-linux-uclibcgnueabi/crosstool.config1
-rw-r--r--samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config1
-rw-r--r--samples/armeb-unknown-eabi/crosstool.config1
-rw-r--r--samples/armeb-unknown-linux-gnueabi/crosstool.config1
-rw-r--r--samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config1
-rw-r--r--samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config2
-rw-r--r--samples/armv6-rpi-linux-gnueabi/crosstool.config1
-rw-r--r--samples/armv7-rpi2-linux-gnueabihf/crosstool.config1
-rw-r--r--samples/armv8-rpi3-linux-gnueabihf/crosstool.config1
-rw-r--r--samples/avr/crosstool.config1
-rw-r--r--samples/i586-geode-linux-uclibc/crosstool.config1
-rw-r--r--samples/i686-centos6-linux-gnu/crosstool.config1
-rw-r--r--samples/i686-centos7-linux-gnu/crosstool.config1
-rw-r--r--samples/i686-nptl-linux-gnu/crosstool.config1
-rw-r--r--samples/i686-ubuntu12.04-linux-gnu/crosstool.config1
-rw-r--r--samples/i686-ubuntu14.04-linux-gnu/crosstool.config1
-rw-r--r--samples/i686-ubuntu16.04-linux-gnu/crosstool.config1
-rw-r--r--samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config1
-rw-r--r--samples/i686-w64-mingw32/crosstool.config1
-rw-r--r--samples/m68k-unknown-elf/crosstool.config1
-rw-r--r--samples/m68k-unknown-uclinux-uclibc/crosstool.config1
-rw-r--r--samples/mips-ar2315-linux-gnu/crosstool.config1
-rw-r--r--samples/mips-malta-linux-gnu/crosstool.config1
-rw-r--r--samples/mips-unknown-elf/crosstool.config1
-rw-r--r--samples/mips-unknown-linux-uclibc/crosstool.config1
-rw-r--r--samples/mips64el-multilib-linux-uclibc/crosstool.config1
-rw-r--r--samples/mipsel-multilib-linux-gnu/crosstool.config1
-rw-r--r--samples/mipsel-sde-elf/crosstool.config1
-rw-r--r--samples/mipsel-unknown-linux-gnu/crosstool.config1
-rw-r--r--samples/moxie-unknown-elf/crosstool.config2
-rw-r--r--samples/moxie-unknown-elf/reported.by9
-rw-r--r--samples/moxiebox/crosstool.config1
-rw-r--r--samples/msp430-unknown-elf/crosstool.config1
-rw-r--r--samples/nios2-altera-linux-gnu/crosstool.config1
-rw-r--r--samples/nios2-unknown-elf/crosstool.config1
-rw-r--r--samples/powerpc-405-linux-gnu/crosstool.config1
-rw-r--r--samples/powerpc-8540-linux-gnu/crosstool.config1
-rw-r--r--samples/powerpc-860-linux-gnu/crosstool.config1
-rw-r--r--samples/powerpc-e300c3-linux-gnu/crosstool.config1
-rw-r--r--samples/powerpc-e500v2-linux-gnuspe/crosstool.config1
-rw-r--r--samples/powerpc-unknown-linux-gnu/crosstool.config1
-rw-r--r--samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config3
-rw-r--r--samples/powerpc-unknown-linux-uclibc/crosstool.config1
-rw-r--r--samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config1
-rw-r--r--samples/powerpc64-multilib-linux-gnu/crosstool.config1
-rw-r--r--samples/powerpc64-unknown-linux-gnu/crosstool.config1
-rw-r--r--samples/powerpc64le-unknown-linux-gnu/crosstool.config1
-rw-r--r--samples/riscv32-hifive1-elf/crosstool.config1
-rw-r--r--samples/riscv32-unknown-elf/crosstool.config1
-rw-r--r--samples/riscv64-unknown-elf/crosstool.config1
-rw-r--r--samples/riscv64-unknown-linux-gnu/crosstool.config4
-rw-r--r--samples/s390-ibm-linux-gnu/crosstool.config1
-rw-r--r--samples/s390x-ibm-linux-gnu/crosstool.config1
-rw-r--r--samples/sh-multilib-linux-gnu/crosstool.config1
-rw-r--r--samples/sh-multilib-linux-uclibc/crosstool.config1
-rw-r--r--samples/sh-unknown-elf/crosstool.config2
-rw-r--r--samples/sparc-leon-linux-uclibc/crosstool.config3
-rw-r--r--samples/sparc-unknown-linux-gnu/crosstool.config1
-rw-r--r--samples/sparc64-multilib-linux-gnu/crosstool.config1
-rw-r--r--samples/x86_64-centos6-linux-gnu/crosstool.config1
-rw-r--r--samples/x86_64-centos7-linux-gnu/crosstool.config1
-rw-r--r--samples/x86_64-multilib-linux-gnu/crosstool.config1
-rw-r--r--samples/x86_64-multilib-linux-musl/crosstool.config1
-rw-r--r--samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config1
-rw-r--r--samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config1
-rw-r--r--samples/x86_64-multilib-linux-uclibc/crosstool.config1
-rw-r--r--samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config1
-rw-r--r--samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config1
-rw-r--r--samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config1
-rw-r--r--samples/x86_64-unknown-linux-gnu/crosstool.config1
-rw-r--r--samples/x86_64-unknown-linux-uclibc/crosstool.config1
-rw-r--r--samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config1
-rw-r--r--samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config1
-rw-r--r--samples/x86_64-w64-mingw32/crosstool.config1
-rw-r--r--samples/xtensa-fsf-linux-uclibc/crosstool.config1
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 f8ef63d..e8c429d 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 0e8a6f8..4d6a319 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 898e4e4..864b100 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 fdda449..7c00f7e 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 321e957..ce5688c 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 485bd2d..7d27de3 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 66a0b52..c011a93 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 19e8e89..975a8c6 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 b56c8a8..ca397c6 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 09cae2b..8081098 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 491046d..4e304a7 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 3e4c024..7e1dc6f 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 49e842c..a5b2588 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 83f781f..671d592 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 6dc39fa..2fc835f 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 82e5714..ab79b7f 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 f52abec..2306a07 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 128d379..4ffa4af 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 c384611..68b6147 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 2993b99..533d666 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 3fd2d2d..53a2137 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 c6779f8..561a855 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 22d7d9f..83ef15b 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 c2b21f8..fe4c7ec 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 4b0c04b..ba08e5d 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 94f1b2a..eb12a0a 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 102c503..51a0e22 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 fe9b5af..bc286b8 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 6283c78..dce6af8 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 08f90f5..908495a 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 c285893..2c960e7 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 498afcc..9df56e9 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 48df330..3e8ed1b 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 958825d..6c02470 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 339c4c6..3778452 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 e7f381e..2db2917 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 c3df4ad..d9f78e4 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 5ed39c0..b92bbe0 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 227d45b..d8edb87 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 61c37f1..d8c6267 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 f9e79d7..5a07139 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 a063908..bed4c1b 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 133d27e..eea2340 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 a4cd5ce..1c1394c 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 faeab87..bec320f 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 9257801..b1972a9 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 8e89c90..86d264d 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 5458b7e..e9567a9 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 c445787..2754d89 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 907a11f..13d42a9 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 58fe653..c0e04e9 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 0443ff1..ed1306f 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 0b87b57..9ed4455 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 1657309..b57f549 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 0e22d92..691e515 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 690e9c2..8019e58 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 6f1db15..d03c149 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 53ad00c..dab2b35 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 aab2632..fd3f7e5 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 29bedbf..473e76e 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 749e26d..64183a4 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 e0f6dcb..02b2cb7 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 b42fa3b..ac85c96 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 d89a262..33ffb87 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 bbe8d5b..1c62804 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 21b9e8c..39bd9f0 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 18f8870..0f22716 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 22a8f3f..1adb2a7 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 221ef20..01adfbc 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 66c288d..ccfb359 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 8648aa5..791cc89 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 32f06c0..d036572 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 9fe6e41..9928d92 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 66caf04..64a81ae 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 9387a51..ad4c43e 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 20612d8..2a48273 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 2b225c7..3441286 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 7ee711f..ff21d2c 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 6f0c10f..68b9747 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 9d16c9e..c2d1e3c 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 5fc177c..9923fe1 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 a24f96f..9a6291d 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 b0ce916..7afd957 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 d5be28f..db72b5c 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 4e08f7c..50a96d6 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 f71ad6d..6b0c078 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 e7bfcd3..ecaac95 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 2a7fc1d..fdc59fb 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 c3518a1..66547b0 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 6b2eb17..945996c 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 2fc67d9..a49e56f 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 f10a91a..78aa808 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 eda9c67..7157afe 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 92f0388..33433d9 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"