summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
Diffstat (limited to 'samples')
-rw-r--r--samples/aarch64-rpi3-linux-gnu/crosstool.config2
-rw-r--r--samples/aarch64-unknown-linux-android/crosstool.config2
-rw-r--r--samples/aarch64-unknown-linux-gnu/crosstool.config2
-rw-r--r--samples/aarch64-unknown-linux-uclibc/crosstool.config2
-rw-r--r--samples/alphaev56-unknown-linux-gnu/crosstool.config2
-rw-r--r--samples/alphaev67-unknown-linux-gnu/crosstool.config2
-rw-r--r--samples/arc-arc700-linux-uclibc/crosstool.config2
-rw-r--r--samples/arc-multilib-elf32/crosstool.config2
-rw-r--r--samples/arc-multilib-linux-uclibc/crosstool.config2
-rw-r--r--samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config2
-rw-r--r--samples/arm-cortex_a15-linux-gnueabihf/crosstool.config2
-rw-r--r--samples/arm-cortex_a8-linux-gnueabi/crosstool.config2
-rw-r--r--samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config2
-rw-r--r--samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config2
-rw-r--r--samples/arm-multilib-linux-uclibcgnueabi/crosstool.config2
-rw-r--r--samples/arm-nano-eabi/crosstool.config2
-rw-r--r--samples/arm-unknown-eabi/crosstool.config2
-rw-r--r--samples/arm-unknown-linux-gnueabi/crosstool.config2
-rw-r--r--samples/arm-unknown-linux-musleabi/crosstool.config2
-rw-r--r--samples/arm-unknown-linux-uclibcgnueabi/crosstool.config2
-rw-r--r--samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config2
-rw-r--r--samples/armeb-unknown-eabi/crosstool.config2
-rw-r--r--samples/armeb-unknown-linux-gnueabi/crosstool.config2
-rw-r--r--samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config2
-rw-r--r--samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config2
-rw-r--r--samples/armv6-rpi-linux-gnueabi/crosstool.config2
-rw-r--r--samples/armv7-rpi2-linux-gnueabihf/crosstool.config2
-rw-r--r--samples/armv8-rpi3-linux-gnueabihf/crosstool.config2
-rw-r--r--samples/avr/crosstool.config2
-rw-r--r--samples/i586-geode-linux-uclibc/crosstool.config2
-rw-r--r--samples/i686-centos6-linux-gnu/crosstool.config2
-rw-r--r--samples/i686-centos7-linux-gnu/crosstool.config2
-rw-r--r--samples/i686-nptl-linux-gnu/crosstool.config2
-rw-r--r--samples/i686-ubuntu12.04-linux-gnu/crosstool.config2
-rw-r--r--samples/i686-ubuntu14.04-linux-gnu/crosstool.config2
-rw-r--r--samples/i686-ubuntu16.04-linux-gnu/crosstool.config2
-rw-r--r--samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config2
-rw-r--r--samples/i686-w64-mingw32/crosstool.config2
-rw-r--r--samples/m68k-unknown-elf/crosstool.config2
-rw-r--r--samples/m68k-unknown-uclinux-uclibc/crosstool.config2
-rw-r--r--samples/mips-ar2315-linux-gnu/crosstool.config2
-rw-r--r--samples/mips-malta-linux-gnu/crosstool.config2
-rw-r--r--samples/mips-unknown-elf/crosstool.config2
-rw-r--r--samples/mips-unknown-linux-uclibc/crosstool.config2
-rw-r--r--samples/mips64el-multilib-linux-uclibc/crosstool.config2
-rw-r--r--samples/mipsel-multilib-linux-gnu/crosstool.config2
-rw-r--r--samples/mipsel-sde-elf/crosstool.config2
-rw-r--r--samples/mipsel-unknown-linux-gnu/crosstool.config2
-rw-r--r--samples/moxie-unknown-elf/crosstool.config2
-rw-r--r--samples/moxiebox/crosstool.config2
-rw-r--r--samples/msp430-unknown-elf/crosstool.config2
-rw-r--r--samples/nios2-altera-linux-gnu/crosstool.config2
-rw-r--r--samples/nios2-unknown-elf/crosstool.config2
-rw-r--r--samples/powerpc-405-linux-gnu/crosstool.config2
-rw-r--r--samples/powerpc-8540-linux-gnu/crosstool.config2
-rw-r--r--samples/powerpc-860-linux-gnu/crosstool.config2
-rw-r--r--samples/powerpc-e300c3-linux-gnu/crosstool.config2
-rw-r--r--samples/powerpc-e500v2-linux-gnuspe/crosstool.config2
-rw-r--r--samples/powerpc-unknown-linux-gnu/crosstool.config2
-rw-r--r--samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config2
-rw-r--r--samples/powerpc-unknown-linux-uclibc/crosstool.config2
-rw-r--r--samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config2
-rw-r--r--samples/powerpc64-multilib-linux-gnu/crosstool.config2
-rw-r--r--samples/powerpc64-unknown-linux-gnu/crosstool.config2
-rw-r--r--samples/powerpc64le-unknown-linux-gnu/crosstool.config2
-rw-r--r--samples/riscv32-hifive1-elf/crosstool.config2
-rw-r--r--samples/riscv32-unknown-elf/crosstool.config2
-rw-r--r--samples/riscv64-unknown-elf/crosstool.config2
-rw-r--r--samples/riscv64-unknown-linux-gnu/crosstool.config2
-rw-r--r--samples/s390-ibm-linux-gnu/crosstool.config2
-rw-r--r--samples/s390x-ibm-linux-gnu/crosstool.config2
-rw-r--r--samples/sh-multilib-linux-gnu/crosstool.config2
-rw-r--r--samples/sh-multilib-linux-uclibc/crosstool.config2
-rw-r--r--samples/sh-unknown-elf/crosstool.config2
-rw-r--r--samples/sparc-leon-linux-uclibc/crosstool.config4
-rw-r--r--samples/sparc-unknown-linux-gnu/crosstool.config2
-rw-r--r--samples/sparc64-multilib-linux-gnu/crosstool.config2
-rw-r--r--samples/x86_64-centos6-linux-gnu/crosstool.config2
-rw-r--r--samples/x86_64-centos7-linux-gnu/crosstool.config2
-rw-r--r--samples/x86_64-multilib-linux-gnu/crosstool.config2
-rw-r--r--samples/x86_64-multilib-linux-musl/crosstool.config2
-rw-r--r--samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config2
-rw-r--r--samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config2
-rw-r--r--samples/x86_64-multilib-linux-uclibc/crosstool.config2
-rw-r--r--samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config2
-rw-r--r--samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config2
-rw-r--r--samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config2
-rw-r--r--samples/x86_64-unknown-linux-gnu/crosstool.config2
-rw-r--r--samples/x86_64-unknown-linux-uclibc/crosstool.config2
-rw-r--r--samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config2
-rw-r--r--samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config2
-rw-r--r--samples/x86_64-w64-mingw32/crosstool.config2
-rw-r--r--samples/xtensa-fsf-linux-uclibc/crosstool.config2
93 files changed, 94 insertions, 94 deletions
diff --git a/samples/aarch64-rpi3-linux-gnu/crosstool.config b/samples/aarch64-rpi3-linux-gnu/crosstool.config
index e8c429d..daa715d 100644
--- a/samples/aarch64-rpi3-linux-gnu/crosstool.config
+++ b/samples/aarch64-rpi3-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 4d6a319..6564573 100644
--- a/samples/aarch64-unknown-linux-android/crosstool.config
+++ b/samples/aarch64-unknown-linux-android/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
CT_EXPERIMENTAL=y
CT_ARCH_ARM=y
CT_ARCH_64=y
diff --git a/samples/aarch64-unknown-linux-gnu/crosstool.config b/samples/aarch64-unknown-linux-gnu/crosstool.config
index 864b100..113b24e 100644
--- a/samples/aarch64-unknown-linux-gnu/crosstool.config
+++ b/samples/aarch64-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 7c00f7e..533bac7 100644
--- a/samples/aarch64-unknown-linux-uclibc/crosstool.config
+++ b/samples/aarch64-unknown-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
CT_ARCH_ARM=y
CT_ARCH_64=y
CT_TARGET_VENDOR=""
diff --git a/samples/alphaev56-unknown-linux-gnu/crosstool.config b/samples/alphaev56-unknown-linux-gnu/crosstool.config
index ce5688c..44ea047 100644
--- a/samples/alphaev56-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 7d27de3..f82b313 100644
--- a/samples/alphaev67-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev67-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 c011a93..8da0b13 100644
--- a/samples/arc-arc700-linux-uclibc/crosstool.config
+++ b/samples/arc-arc700-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
CT_ARCH_ARC=y
CT_ARCH_CPU="arc700"
CT_TARGET_CFLAGS="-mno-atomic"
diff --git a/samples/arc-multilib-elf32/crosstool.config b/samples/arc-multilib-elf32/crosstool.config
index 975a8c6..826d3a9 100644
--- a/samples/arc-multilib-elf32/crosstool.config
+++ b/samples/arc-multilib-elf32/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 ca397c6..c4bed05 100644
--- a/samples/arc-multilib-linux-uclibc/crosstool.config
+++ b/samples/arc-multilib-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
CT_ARCH_ARC=y
CT_MULTILIB=y
CT_TARGET_CFLAGS="-matomic"
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 8081098..3e4623c 100644
--- a/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
+++ b/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 4e304a7..ab4a6a9 100644
--- a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 7e1dc6f..448327c 100644
--- a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
+++ b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 a5b2588..a0a5f10 100644
--- a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 671d592..1aa23fb 100644
--- a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 2fc835f..7d7936a 100644
--- a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 ab79b7f..8625724 100644
--- a/samples/arm-nano-eabi/crosstool.config
+++ b/samples/arm-nano-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 2306a07..dff2fea 100644
--- a/samples/arm-unknown-eabi/crosstool.config
+++ b/samples/arm-unknown-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 4ffa4af..fec7611 100644
--- a/samples/arm-unknown-linux-gnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-gnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
# 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 68b6147..15dc56e 100644
--- a/samples/arm-unknown-linux-musleabi/crosstool.config
+++ b/samples/arm-unknown-linux-musleabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 533d666..9ff7937 100644
--- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 53a2137..83b5eab 100644
--- a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 561a855..38277ad 100644
--- a/samples/armeb-unknown-eabi/crosstool.config
+++ b/samples/armeb-unknown-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 83ef15b..46daaf2 100644
--- a/samples/armeb-unknown-linux-gnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 fe4c7ec..bb05f92 100644
--- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 ba08e5d..3dc9052 100644
--- a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
CT_ARCH_ARM=y
CT_ARCH_SUFFIX="v6"
# CT_ARCH_USE_MMU is not set
diff --git a/samples/armv6-rpi-linux-gnueabi/crosstool.config b/samples/armv6-rpi-linux-gnueabi/crosstool.config
index eb12a0a..a34de69 100644
--- a/samples/armv6-rpi-linux-gnueabi/crosstool.config
+++ b/samples/armv6-rpi-linux-gnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 51a0e22..bbe0b14 100644
--- a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
+++ b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 bc286b8..33175bd 100644
--- a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
+++ b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 dce6af8..c0ad517 100644
--- a/samples/avr/crosstool.config
+++ b/samples/avr/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 908495a..b6863a1 100644
--- a/samples/i586-geode-linux-uclibc/crosstool.config
+++ b/samples/i586-geode-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 2c960e7..02c16af 100644
--- a/samples/i686-centos6-linux-gnu/crosstool.config
+++ b/samples/i686-centos6-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 9df56e9..033cecf 100644
--- a/samples/i686-centos7-linux-gnu/crosstool.config
+++ b/samples/i686-centos7-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 3e8ed1b..407c010 100644
--- a/samples/i686-nptl-linux-gnu/crosstool.config
+++ b/samples/i686-nptl-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 6c02470..c23c14b 100644
--- a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 3778452..bb84510 100644
--- a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 2db2917..8cd1108 100644
--- a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 d9f78e4..2ecef5b 100644
--- a/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
+++ b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 b92bbe0..741cbd2 100644
--- a/samples/i686-w64-mingw32/crosstool.config
+++ b/samples/i686-w64-mingw32/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 d8edb87..acb66a2 100644
--- a/samples/m68k-unknown-elf/crosstool.config
+++ b/samples/m68k-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 d8c6267..29d4bb2 100644
--- a/samples/m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 5a07139..b4f3111 100644
--- a/samples/mips-ar2315-linux-gnu/crosstool.config
+++ b/samples/mips-ar2315-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 bed4c1b..67ea272 100644
--- a/samples/mips-malta-linux-gnu/crosstool.config
+++ b/samples/mips-malta-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 eea2340..266b19d 100644
--- a/samples/mips-unknown-elf/crosstool.config
+++ b/samples/mips-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 1c1394c..69e95d1 100644
--- a/samples/mips-unknown-linux-uclibc/crosstool.config
+++ b/samples/mips-unknown-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 bec320f..2508cd0 100644
--- a/samples/mips64el-multilib-linux-uclibc/crosstool.config
+++ b/samples/mips64el-multilib-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 b1972a9..c7967a4 100644
--- a/samples/mipsel-multilib-linux-gnu/crosstool.config
+++ b/samples/mipsel-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 86d264d..b481a7f 100644
--- a/samples/mipsel-sde-elf/crosstool.config
+++ b/samples/mipsel-sde-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 e9567a9..3e0271a 100644
--- a/samples/mipsel-unknown-linux-gnu/crosstool.config
+++ b/samples/mipsel-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 2754d89..5002bfb 100644
--- a/samples/moxie-unknown-elf/crosstool.config
+++ b/samples/moxie-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
CT_EXPERIMENTAL=y
CT_ARCH_MOXIE=y
CT_DEBUG_GDB=y
diff --git a/samples/moxiebox/crosstool.config b/samples/moxiebox/crosstool.config
index c0e04e9..fed00ed 100644
--- a/samples/moxiebox/crosstool.config
+++ b/samples/moxiebox/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 ed1306f..b791c99 100644
--- a/samples/msp430-unknown-elf/crosstool.config
+++ b/samples/msp430-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 9ed4455..6ecf6d5 100644
--- a/samples/nios2-altera-linux-gnu/crosstool.config
+++ b/samples/nios2-altera-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 b57f549..521c6a7 100644
--- a/samples/nios2-unknown-elf/crosstool.config
+++ b/samples/nios2-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 691e515..6705d71 100644
--- a/samples/powerpc-405-linux-gnu/crosstool.config
+++ b/samples/powerpc-405-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 8019e58..1cf0c15 100644
--- a/samples/powerpc-8540-linux-gnu/crosstool.config
+++ b/samples/powerpc-8540-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 d03c149..7fafb1d 100644
--- a/samples/powerpc-860-linux-gnu/crosstool.config
+++ b/samples/powerpc-860-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 dab2b35..77039a2 100644
--- a/samples/powerpc-e300c3-linux-gnu/crosstool.config
+++ b/samples/powerpc-e300c3-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 fd3f7e5..5d9aece 100644
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 473e76e..a5f17c5 100644
--- a/samples/powerpc-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 64183a4..ee92573 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,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
CT_ARCH_M68K=y
CT_CANADIAN=y
CT_HOST="powerpc-unknown-linux-uclibc"
diff --git a/samples/powerpc-unknown-linux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc/crosstool.config
index 02b2cb7..655b636 100644
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 ac85c96..c560bdb 100644
--- a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 33ffb87..83babea 100644
--- a/samples/powerpc64-multilib-linux-gnu/crosstool.config
+++ b/samples/powerpc64-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 1c62804..72f4604 100644
--- a/samples/powerpc64-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 39bd9f0..12b69d7 100644
--- a/samples/powerpc64le-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64le-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 0f22716..e525c27 100644
--- a/samples/riscv32-hifive1-elf/crosstool.config
+++ b/samples/riscv32-hifive1-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 1adb2a7..df459bd 100644
--- a/samples/riscv32-unknown-elf/crosstool.config
+++ b/samples/riscv32-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 01adfbc..0110f56 100644
--- a/samples/riscv64-unknown-elf/crosstool.config
+++ b/samples/riscv64-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 ccfb359..215ff51 100644
--- a/samples/riscv64-unknown-linux-gnu/crosstool.config
+++ b/samples/riscv64-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
CT_EXPERIMENTAL=y
CT_ARCH_RISCV=y
# CT_DEMULTILIB is not set
diff --git a/samples/s390-ibm-linux-gnu/crosstool.config b/samples/s390-ibm-linux-gnu/crosstool.config
index 791cc89..6587f1f 100644
--- a/samples/s390-ibm-linux-gnu/crosstool.config
+++ b/samples/s390-ibm-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 d036572..307af1c 100644
--- a/samples/s390x-ibm-linux-gnu/crosstool.config
+++ b/samples/s390x-ibm-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 9928d92..e697d22 100644
--- a/samples/sh-multilib-linux-gnu/crosstool.config
+++ b/samples/sh-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 64a81ae..3b6bb57 100644
--- a/samples/sh-multilib-linux-uclibc/crosstool.config
+++ b/samples/sh-multilib-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 ad4c43e..1bae40e 100644
--- a/samples/sh-unknown-elf/crosstool.config
+++ b/samples/sh-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
CT_ARCH_SH=y
CT_ARCH_LE_BE=y
CT_BINUTILS_PLUGINS=y
diff --git a/samples/sparc-leon-linux-uclibc/crosstool.config b/samples/sparc-leon-linux-uclibc/crosstool.config
index 2a48273..19e855f 100644
--- a/samples/sparc-leon-linux-uclibc/crosstool.config
+++ b/samples/sparc-leon-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
CT_ARCH_SPARC=y
CT_ARCH_CPU="leon"
CT_ARCH_TUNE="leon"
@@ -9,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_5_0=y
+CT_GCC_V_6=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 3441286..cf37073 100644
--- a/samples/sparc-unknown-linux-gnu/crosstool.config
+++ b/samples/sparc-unknown-linux-gnu/crosstool.config
@@ -1,3 +1,3 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 ff21d2c..87a01fa 100644
--- a/samples/sparc64-multilib-linux-gnu/crosstool.config
+++ b/samples/sparc64-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 68b9747..51a9002 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="1"
+CT_CONFIG_VERSION="2"
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 c2d1e3c..9fec08e 100644
--- a/samples/x86_64-centos7-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos7-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 9923fe1..f571ac4 100644
--- a/samples/x86_64-multilib-linux-gnu/crosstool.config
+++ b/samples/x86_64-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 9a6291d..a5f3b2a 100644
--- a/samples/x86_64-multilib-linux-musl/crosstool.config
+++ b/samples/x86_64-multilib-linux-musl/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 7afd957..7581820 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,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 db72b5c..fee71b8 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,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 50a96d6..81626a3 100644
--- a/samples/x86_64-multilib-linux-uclibc/crosstool.config
+++ b/samples/x86_64-multilib-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 6b0c078..6b65e94 100644
--- a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 ecaac95..3339623 100644
--- a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 fdc59fb..b7193f4 100644
--- a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 66547b0..c1026ec 100644
--- a/samples/x86_64-unknown-linux-gnu/crosstool.config
+++ b/samples/x86_64-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 945996c..101294e 100644
--- a/samples/x86_64-unknown-linux-uclibc/crosstool.config
+++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 a49e56f..1f44af2 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,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 78aa808..cd801b0 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,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 7157afe..66aedc5 100644
--- a/samples/x86_64-w64-mingw32/crosstool.config
+++ b/samples/x86_64-w64-mingw32/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
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 33433d9..81ea170 100644
--- a/samples/xtensa-fsf-linux-uclibc/crosstool.config
+++ b/samples/xtensa-fsf-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="1"
+CT_CONFIG_VERSION="2"
CT_ARCH_XTENSA=y
CT_ARCH_BE=y
CT_TARGET_CFLAGS="-mlongcalls -mtext-section-literals"