Update the samples to v3

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

94 files changed, 94 insertions, 95 deletions

diff --git a/samples/aarch64-rpi3-linux-gnu/crosstool.config b/samples/aarch64-rpi3-linux-gnu/crosstool.config
index daa715df..dc9f364b 100644
--- a/samples/aarch64-rpi3-linux-gnu/crosstool.config
+++ b/samples/aarch64-rpi3-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 6564573d..9bafead0 100644
--- a/samples/aarch64-unknown-linux-android/crosstool.config
+++ b/samples/aarch64-unknown-linux-android/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 113b24e5..255a0057 100644
--- a/samples/aarch64-unknown-linux-gnu/crosstool.config
+++ b/samples/aarch64-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 533bac7a..e2ac47b1 100644
--- a/samples/aarch64-unknown-linux-uclibc/crosstool.config
+++ b/samples/aarch64-unknown-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 44ea0479..cd713cc6 100644
--- a/samples/alphaev56-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 f82b3131..4d7aa51a 100644
--- a/samples/alphaev67-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev67-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 8da0b136..caa0cf19 100644
--- a/samples/arc-arc700-linux-uclibc/crosstool.config
+++ b/samples/arc-arc700-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 826d3a97..0cc3cdd3 100644
--- a/samples/arc-multilib-elf32/crosstool.config
+++ b/samples/arc-multilib-elf32/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 c4bed05d..b1862a5b 100644
--- a/samples/arc-multilib-linux-uclibc/crosstool.config
+++ b/samples/arc-multilib-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 3e4623c3..4d3a79f6 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="2"
+CT_CONFIG_VERSION="3"
 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 ab4a6a9a..48d8dc3a 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="2"
+CT_CONFIG_VERSION="3"
 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 448327cd..aa65f234 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="2"
+CT_CONFIG_VERSION="3"
 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 a0a5f10c..bed98948 100644
--- a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 1aa23fb9..e85d4409 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="2"
+CT_CONFIG_VERSION="3"
 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 7d7936a7..50a7507f 100644
--- a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 86257243..bbdcb393 100644
--- a/samples/arm-nano-eabi/crosstool.config
+++ b/samples/arm-nano-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 dff2fea1..5636c368 100644
--- a/samples/arm-unknown-eabi/crosstool.config
+++ b/samples/arm-unknown-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 fec7611d..f4fc942e 100644
--- a/samples/arm-unknown-linux-gnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-gnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 # 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 15dc56e5..a4d84869 100644
--- a/samples/arm-unknown-linux-musleabi/crosstool.config
+++ b/samples/arm-unknown-linux-musleabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 9ff7937a..84243cf1 100644
--- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 83b5eab1..633493c8 100644
--- a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 38277adc..9e18e965 100644
--- a/samples/armeb-unknown-eabi/crosstool.config
+++ b/samples/armeb-unknown-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 46daaf22..a030f4c7 100644
--- a/samples/armeb-unknown-linux-gnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 bb05f92c..ad24f4da 100644
--- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 3dc9052c..0f1dd4dd 100644
--- a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
@@ -1,11 +1,10 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 CT_ARCH_ARM=y
 CT_ARCH_SUFFIX="v6"
 # CT_ARCH_USE_MMU is not set
 CT_TARGET_VENDOR="nommu"
 CT_KERNEL_LINUX=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-# CT_SHARED_LIBS is not set
 CT_BINUTILS_PLUGINS=y
 CT_THREADS_NONE=y
 CT_CC_GCC_DISABLE_PCH=y
diff --git a/samples/armv6-rpi-linux-gnueabi/crosstool.config b/samples/armv6-rpi-linux-gnueabi/crosstool.config
index a34de693..c18e70a2 100644
--- a/samples/armv6-rpi-linux-gnueabi/crosstool.config
+++ b/samples/armv6-rpi-linux-gnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 bbe0b142..fdabda6c 100644
--- a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
+++ b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 33175bd9..1197ee43 100644
--- a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
+++ b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 c0ad517d..fe4b16cd 100644
--- a/samples/avr/crosstool.config
+++ b/samples/avr/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 b6863a1a..87c5f921 100644
--- a/samples/i586-geode-linux-uclibc/crosstool.config
+++ b/samples/i586-geode-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 02c16afd..cb7f7132 100644
--- a/samples/i686-centos6-linux-gnu/crosstool.config
+++ b/samples/i686-centos6-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 033cecfb..98d9fd99 100644
--- a/samples/i686-centos7-linux-gnu/crosstool.config
+++ b/samples/i686-centos7-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 407c010a..546e9cdb 100644
--- a/samples/i686-nptl-linux-gnu/crosstool.config
+++ b/samples/i686-nptl-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 c23c14b2..e5ece3e4 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="2"
+CT_CONFIG_VERSION="3"
 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 bb84510e..50fb8731 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="2"
+CT_CONFIG_VERSION="3"
 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 8cd1108b..6155de21 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="2"
+CT_CONFIG_VERSION="3"
 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 2ecef5b9..4e628afb 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="2"
+CT_CONFIG_VERSION="3"
 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 741cbd25..bba57386 100644
--- a/samples/i686-w64-mingw32/crosstool.config
+++ b/samples/i686-w64-mingw32/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 acb66a21..6c8199b7 100644
--- a/samples/m68k-unknown-elf/crosstool.config
+++ b/samples/m68k-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 29d4bb22..15cf7d05 100644
--- a/samples/m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 b4f31119..51d9180f 100644
--- a/samples/mips-ar2315-linux-gnu/crosstool.config
+++ b/samples/mips-ar2315-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 67ea2721..2b9c8bc4 100644
--- a/samples/mips-malta-linux-gnu/crosstool.config
+++ b/samples/mips-malta-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 266b19de..d99ad7f3 100644
--- a/samples/mips-unknown-elf/crosstool.config
+++ b/samples/mips-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 69e95d1b..001a6413 100644
--- a/samples/mips-unknown-linux-uclibc/crosstool.config
+++ b/samples/mips-unknown-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 2508cd07..72908e53 100644
--- a/samples/mips64el-multilib-linux-uclibc/crosstool.config
+++ b/samples/mips64el-multilib-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 c7967a4d..6f1e65aa 100644
--- a/samples/mipsel-multilib-linux-gnu/crosstool.config
+++ b/samples/mipsel-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 b481a7fe..23a01a49 100644
--- a/samples/mipsel-sde-elf/crosstool.config
+++ b/samples/mipsel-sde-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 3e0271a3..7d6c4f25 100644
--- a/samples/mipsel-unknown-linux-gnu/crosstool.config
+++ b/samples/mipsel-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 5002bfbd..50e05346 100644
--- a/samples/moxie-unknown-elf/crosstool.config
+++ b/samples/moxie-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 CT_EXPERIMENTAL=y
 CT_ARCH_MOXIE=y
 CT_DEBUG_GDB=y
diff --git a/samples/moxiebox/crosstool.config b/samples/moxiebox/crosstool.config
index fed00ed0..2008fd5a 100644
--- a/samples/moxiebox/crosstool.config
+++ b/samples/moxiebox/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 b791c996..7eb82c9a 100644
--- a/samples/msp430-unknown-elf/crosstool.config
+++ b/samples/msp430-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 6ecf6d54..c6f51c50 100644
--- a/samples/nios2-altera-linux-gnu/crosstool.config
+++ b/samples/nios2-altera-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 521c6a7c..541a5c5c 100644
--- a/samples/nios2-unknown-elf/crosstool.config
+++ b/samples/nios2-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 6705d716..21de17a4 100644
--- a/samples/powerpc-405-linux-gnu/crosstool.config
+++ b/samples/powerpc-405-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 1cf0c153..d449c618 100644
--- a/samples/powerpc-8540-linux-gnu/crosstool.config
+++ b/samples/powerpc-8540-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 7fafb1d5..f5a2b357 100644
--- a/samples/powerpc-860-linux-gnu/crosstool.config
+++ b/samples/powerpc-860-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 77039a25..b339e12a 100644
--- a/samples/powerpc-e300c3-linux-gnu/crosstool.config
+++ b/samples/powerpc-e300c3-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 5d9aecef..b85928eb 100644
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 a5f17c5e..67b36a9f 100644
--- a/samples/powerpc-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 ee92573c..9c209fda 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="2"
+CT_CONFIG_VERSION="3"
 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 655b6368..0950dcdc 100644
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 c560bdb7..b2983bac 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="2"
+CT_CONFIG_VERSION="3"
 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 83babeaa..05b97870 100644
--- a/samples/powerpc64-multilib-linux-gnu/crosstool.config
+++ b/samples/powerpc64-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 72f46041..04696282 100644
--- a/samples/powerpc64-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 12b69d77..95d80250 100644
--- a/samples/powerpc64le-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64le-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 e525c27c..49c93400 100644
--- a/samples/riscv32-hifive1-elf/crosstool.config
+++ b/samples/riscv32-hifive1-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 df459bde..1d68b8f6 100644
--- a/samples/riscv32-unknown-elf/crosstool.config
+++ b/samples/riscv32-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 0110f563..87e9b717 100644
--- a/samples/riscv64-unknown-elf/crosstool.config
+++ b/samples/riscv64-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 215ff519..a03f6e88 100644
--- a/samples/riscv64-unknown-linux-gnu/crosstool.config
+++ b/samples/riscv64-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 6587f1f7..bf6fbe03 100644
--- a/samples/s390-ibm-linux-gnu/crosstool.config
+++ b/samples/s390-ibm-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 307af1c1..55b1622e 100644
--- a/samples/s390x-ibm-linux-gnu/crosstool.config
+++ b/samples/s390x-ibm-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 e697d22e..78e0ce48 100644
--- a/samples/sh-multilib-linux-gnu/crosstool.config
+++ b/samples/sh-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 3b6bb57c..c4514f68 100644
--- a/samples/sh-multilib-linux-uclibc/crosstool.config
+++ b/samples/sh-multilib-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 1bae40ee..cf06c371 100644
--- a/samples/sh-unknown-elf/crosstool.config
+++ b/samples/sh-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 19e855f5..88bb7a7e 100644
--- a/samples/sparc-leon-linux-uclibc/crosstool.config
+++ b/samples/sparc-leon-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 CT_ARCH_SPARC=y
 CT_ARCH_CPU="leon"
 CT_ARCH_TUNE="leon"
diff --git a/samples/sparc-unknown-linux-gnu/crosstool.config b/samples/sparc-unknown-linux-gnu/crosstool.config
index cf370731..ee5191c7 100644
--- a/samples/sparc-unknown-linux-gnu/crosstool.config
+++ b/samples/sparc-unknown-linux-gnu/crosstool.config
@@ -1,3 +1,3 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 87a01fac..ea235633 100644
--- a/samples/sparc64-multilib-linux-gnu/crosstool.config
+++ b/samples/sparc64-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 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 51a9002e..24e8a11f 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="2"
+CT_CONFIG_VERSION="3"
 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 9fec08e2..08319709 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="2"
+CT_CONFIG_VERSION="3"
 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 f571ac45..b5814563 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="2"
+CT_CONFIG_VERSION="3"
 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 a5f3b2ac..83edf11d 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="2"
+CT_CONFIG_VERSION="3"
 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 75818209..5fd79e4d 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="2"
+CT_CONFIG_VERSION="3"
 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 fee71b8f..07c01554 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="2"
+CT_CONFIG_VERSION="3"
 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 81626a39..01363763 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="2"
+CT_CONFIG_VERSION="3"
 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 6b65e94e..45d80bc9 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="2"
+CT_CONFIG_VERSION="3"
 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 3339623f..535df2b9 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="2"
+CT_CONFIG_VERSION="3"
 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 b7193f4f..4948c001 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="2"
+CT_CONFIG_VERSION="3"
 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 c1026ec1..27637ed9 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="2"
+CT_CONFIG_VERSION="3"
 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 101294e7..9b1687ef 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="2"
+CT_CONFIG_VERSION="3"
 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 1f44af2b..638c6c19 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="2"
+CT_CONFIG_VERSION="3"
 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 cd801b05..64cfbcdb 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="2"
+CT_CONFIG_VERSION="3"
 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 66aedc56..40cbe128 100644
--- a/samples/x86_64-w64-mingw32/crosstool.config
+++ b/samples/x86_64-w64-mingw32/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 CT_EXPERIMENTAL=y
 CT_ARCH_X86=y
 CT_MULTILIB=y
diff --git a/samples/xtensa-fsf-elf/crosstool.config b/samples/xtensa-fsf-elf/crosstool.config
index 8a65f790..131df9e6 100644
--- a/samples/xtensa-fsf-elf/crosstool.config
+++ b/samples/xtensa-fsf-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 CT_EXPERIMENTAL=y
 CT_ALLOW_BUILD_AS_ROOT=y
 CT_ALLOW_BUILD_AS_ROOT_SURE=y
diff --git a/samples/xtensa-fsf-linux-uclibc/crosstool.config b/samples/xtensa-fsf-linux-uclibc/crosstool.config
index 81ea1706..3c524b0c 100644
--- a/samples/xtensa-fsf-linux-uclibc/crosstool.config
+++ b/samples/xtensa-fsf-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="2"
+CT_CONFIG_VERSION="3"
 CT_ARCH_XTENSA=y
 CT_ARCH_BE=y
 CT_TARGET_CFLAGS="-mlongcalls -mtext-section-literals"