More sample config updates

*-moxie*: DTC_VERBOSE is a wobbler, it depends on whether dtc is enabled
on the host machine (if dtc is installed, DTC defaults to 'n' and hence
prevents DTC_VERBOSE from appearing at all). Remove the option from
config file so that its value reverts to the default.

xtensa-fsf-elf: mark configuration obsolete so that it can use GDB 8.1
(it uses custom sources and needs to select the version therein)

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

104 files changed, 122 insertions, 150 deletions

diff --git a/samples/aarch64-ol7u9-linux-gnu/crosstool.config b/samples/aarch64-ol7u9-linux-gnu/crosstool.config
index ae644e66..d6b538ee 100644
--- a/samples/aarch64-ol7u9-linux-gnu/crosstool.config
+++ b/samples/aarch64-ol7u9-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_OBSOLETE=y
 CT_ARCH_ARM=y
 CT_ARCH_64=y
diff --git a/samples/aarch64-rpi3-linux-gnu/crosstool.config b/samples/aarch64-rpi3-linux-gnu/crosstool.config
index dc9f364b..55f4a92f 100644
--- a/samples/aarch64-rpi3-linux-gnu/crosstool.config
+++ b/samples/aarch64-rpi3-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a53"
 CT_ARCH_64=y
diff --git a/samples/aarch64-rpi4-linux-gnu/crosstool.config b/samples/aarch64-rpi4-linux-gnu/crosstool.config
index 6324dedb..63726a87 100644
--- a/samples/aarch64-rpi4-linux-gnu/crosstool.config
+++ b/samples/aarch64-rpi4-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a72"
 CT_ARCH_64=y
diff --git a/samples/aarch64-unknown-linux-android/crosstool.config b/samples/aarch64-unknown-linux-android/crosstool.config
index 9bafead0..c78a1f68 100644
--- a/samples/aarch64-unknown-linux-android/crosstool.config
+++ b/samples/aarch64-unknown-linux-android/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 255a0057..df6f415e 100644
--- a/samples/aarch64-unknown-linux-gnu/crosstool.config
+++ b/samples/aarch64-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 e2ac47b1..a5bb45a0 100644
--- a/samples/aarch64-unknown-linux-uclibc/crosstool.config
+++ b/samples/aarch64-unknown-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR=""
@@ -7,7 +7,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
 CT_GDB_NATIVE=y
diff --git a/samples/alphaev56-unknown-linux-gnu/crosstool.config b/samples/alphaev56-unknown-linux-gnu/crosstool.config
index cd713cc6..548190f0 100644
--- a/samples/alphaev56-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 4d7aa51a..52196010 100644
--- a/samples/alphaev67-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev67-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ALPHA_EV67=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=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 4d3a79f6..10aceed4 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="3"
+CT_CONFIG_VERSION="4"
 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 48d8dc3a..271fcac5 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="3"
+CT_CONFIG_VERSION="4"
 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 aa65f234..4954c521 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="3"
+CT_CONFIG_VERSION="4"
 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 bed98948..0fd6f72f 100644
--- a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a5"
@@ -10,7 +10,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=y
diff --git a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
index e85d4409..4b7a5349 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="3"
+CT_CONFIG_VERSION="4"
 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 50a7507f..4f962638 100644
--- a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_MULTILIB=y
 CT_ARCH_FLOAT_SW=y
@@ -9,7 +9,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_THREADS_NONE=y
 CT_CC_GCC_MULTILIB_LIST="aprofile"
 CT_DEBUG_LTRACE=y
diff --git a/samples/arm-nano-eabi/crosstool.config b/samples/arm-nano-eabi/crosstool.config
index bbdcb393..72060078 100644
--- a/samples/arm-nano-eabi/crosstool.config
+++ b/samples/arm-nano-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_MULTILIB=y
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/arm-ol7u9-linux-gnueabi/crosstool.config b/samples/arm-ol7u9-linux-gnueabi/crosstool.config
index 93961af6..bb12842a 100644
--- a/samples/arm-ol7u9-linux-gnueabi/crosstool.config
+++ b/samples/arm-ol7u9-linux-gnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_OBSOLETE=y
 CT_ARCH_ARM=y
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/arm-ol7u9-linux-gnueabihf/crosstool.config b/samples/arm-ol7u9-linux-gnueabihf/crosstool.config
index fd33aeee..1f0c9aba 100644
--- a/samples/arm-ol7u9-linux-gnueabihf/crosstool.config
+++ b/samples/arm-ol7u9-linux-gnueabihf/crosstool.config
@@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="4"
 CT_OBSOLETE=y
 CT_ARCH_ARM=y
 CT_ARCH_FLOAT_HW=y
diff --git a/samples/arm-picolibc-eabi/crosstool.config b/samples/arm-picolibc-eabi/crosstool.config
index 1da16169..640f3071 100644
--- a/samples/arm-picolibc-eabi/crosstool.config
+++ b/samples/arm-picolibc-eabi/crosstool.config
@@ -1,11 +1,11 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_MULTILIB=y
 CT_ARCH_FLOAT_SW=y
+CT_TARGET_CFLAGS="-ftls-model=local-exec"
 CT_TARGET_VENDOR="picolibc"
 CT_LIBC_NONE=y
-CT_CC_GCC_CONFIG_TLS=y
-CT_TARGET_CFLAGS="-ftls-model=local-exec"
 CT_CC_GCC_MULTILIB_LIST="rmprofile"
-CT_COMP_LIBS_PICOLIBC=y
+CT_CC_GCC_CONFIG_TLS=y
 CT_CC_LANG_CXX=y
+CT_COMP_LIBS_PICOLIBC=y
diff --git a/samples/arm-unknown-eabi/crosstool.config b/samples/arm-unknown-eabi/crosstool.config
index ffe09859..e54f2c99 100644
--- a/samples/arm-unknown-eabi/crosstool.config
+++ b/samples/arm-unknown-eabi/crosstool.config
@@ -1,11 +1,11 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_ARCH_FLOAT_SW=y
+CT_TARGET_CFLAGS="-ftls-model=local-exec"
 CT_LIBC_NEWLIB_IO_C99FMT=y
 CT_LIBC_NEWLIB_IO_LL=y
 CT_LIBC_NEWLIB_IO_FLOAT=y
 CT_LIBC_NEWLIB_DISABLE_SUPPLIED_SYSCALLS=y
 CT_CC_LANG_CXX=y
-CT_COMP_LIBS_PICOLIBC=y
-CT_TARGET_CFLAGS="-ftls-model=local-exec"
 CT_COMP_LIBS_NEWLIB_NANO=y
+CT_COMP_LIBS_PICOLIBC=y
diff --git a/samples/arm-unknown-linux-gnueabi/crosstool.config b/samples/arm-unknown-linux-gnueabi/crosstool.config
index f4fc942e..b26f33f8 100644
--- a/samples/arm-unknown-linux-gnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-gnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 # 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 a4d84869..a7adfebf 100644
--- a/samples/arm-unknown-linux-musleabi/crosstool.config
+++ b/samples/arm-unknown-linux-musleabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 84243cf1..379c6322 100644
--- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="arm926ej-s"
 CT_ARCH_FLOAT_SW=y
@@ -7,7 +7,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=y
diff --git a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
index 633493c8..3f2b5f63 100644
--- a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_CPU="arm926ej-s"
@@ -8,7 +8,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=y
diff --git a/samples/armeb-unknown-eabi/crosstool.config b/samples/armeb-unknown-eabi/crosstool.config
index 9e18e965..92fa0a8c 100644
--- a/samples/armeb-unknown-eabi/crosstool.config
+++ b/samples/armeb-unknown-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 a030f4c7..9a03b800 100644
--- a/samples/armeb-unknown-linux-gnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 ad24f4da..9b701f56 100644
--- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="xscale"
 CT_ARCH_BE=y
@@ -8,7 +8,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 # CT_CC_GCC_SJLJ_EXCEPTIONS is not set
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
diff --git a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
index 0f1dd4dd..78e9e982 100644
--- a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_ARCH_SUFFIX="v6"
 # CT_ARCH_USE_MMU is not set
diff --git a/samples/armv6-unknown-linux-gnueabi/crosstool.config b/samples/armv6-unknown-linux-gnueabi/crosstool.config
index c18e70a2..3af9d6ba 100644
--- a/samples/armv6-unknown-linux-gnueabi/crosstool.config
+++ b/samples/armv6-unknown-linux-gnueabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="arm1176jzf-s"
 CT_ARCH_SUFFIX="v6"
diff --git a/samples/armv6-unknown-linux-gnueabihf/crosstool.config b/samples/armv6-unknown-linux-gnueabihf/crosstool.config
index 1104c7b7..38c6685a 100644
--- a/samples/armv6-unknown-linux-gnueabihf/crosstool.config
+++ b/samples/armv6-unknown-linux-gnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 fdabda6c..d3e1ea37 100644
--- a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
+++ b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 1197ee43..22e7b20b 100644
--- a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
+++ b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a53"
 CT_ARCH_SUFFIX="v8"
diff --git a/samples/armv8-rpi4-linux-gnueabihf/crosstool.config b/samples/armv8-rpi4-linux-gnueabihf/crosstool.config
index 309747b0..5a668ed4 100644
--- a/samples/armv8-rpi4-linux-gnueabihf/crosstool.config
+++ b/samples/armv8-rpi4-linux-gnueabihf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a72"
 CT_ARCH_SUFFIX="v8"
diff --git a/samples/avr/crosstool.config b/samples/avr/crosstool.config
index fe4b16cd..c119e881 100644
--- a/samples/avr/crosstool.config
+++ b/samples/avr/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 87c5f921..78c90a38 100644
--- a/samples/i586-geode-linux-uclibc/crosstool.config
+++ b/samples/i586-geode-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_X86=y
 CT_ARCH_ARCH="pentium-mmx"
 CT_TARGET_VENDOR="geode"
@@ -7,7 +7,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=y
diff --git a/samples/i686-centos6-linux-gnu/crosstool.config b/samples/i686-centos6-linux-gnu/crosstool.config
index ffdb9059..19448f94 100644
--- a/samples/i686-centos6-linux-gnu/crosstool.config
+++ b/samples/i686-centos6-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
diff --git a/samples/i686-centos7-linux-gnu/crosstool.config b/samples/i686-centos7-linux-gnu/crosstool.config
index 98d9fd99..dc953042 100644
--- a/samples/i686-centos7-linux-gnu/crosstool.config
+++ b/samples/i686-centos7-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
diff --git a/samples/i686-nptl-linux-gnu/crosstool.config b/samples/i686-nptl-linux-gnu/crosstool.config
index 546e9cdb..0a38607b 100644
--- a/samples/i686-nptl-linux-gnu/crosstool.config
+++ b/samples/i686-nptl-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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
deleted file mode 100644
index e5ece3e4..00000000
--- a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
+++ /dev/null
@@ -1,10 +0,0 @@
-CT_CONFIG_VERSION="3"
-CT_OBSOLETE=y
-CT_ARCH_X86=y
-CT_ARCH_ARCH="i686"
-CT_TARGET_VENDOR="ubuntu12.04"
-CT_KERNEL_LINUX=y
-CT_LINUX_V_3_2=y
-# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_GLIBC_V_2_15=y
-CT_CC_LANG_CXX=y
diff --git a/samples/i686-ubuntu12.04-linux-gnu/reported.by b/samples/i686-ubuntu12.04-linux-gnu/reported.by
deleted file mode 100644
index 97ae2f82..00000000
--- a/samples/i686-ubuntu12.04-linux-gnu/reported.by
+++ /dev/null
@@ -1,3 +0,0 @@
-reporter_name="Alexey Neyman"
-reporter_url=""
-reporter_comment="i686 kernel/libc matching Ubuntu 12.04 LTS."
diff --git a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
index 50fb8731..4a5bb925 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="3"
+CT_CONFIG_VERSION="4"
 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 6155de21..ac57a367 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="3"
+CT_CONFIG_VERSION="4"
 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 4e628afb..2e839dd7 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="3"
+CT_CONFIG_VERSION="4"
 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 bba57386..c731d7b3 100644
--- a/samples/i686-w64-mingw32/crosstool.config
+++ b/samples/i686-w64-mingw32/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 6c8199b7..44131781 100644
--- a/samples/m68k-unknown-elf/crosstool.config
+++ b/samples/m68k-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 15cf7d05..c825d375 100644
--- a/samples/m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 51d9180f..6909c66e 100644
--- a/samples/mips-ar2315-linux-gnu/crosstool.config
+++ b/samples/mips-ar2315-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 2b9c8bc4..c5df0044 100644
--- a/samples/mips-malta-linux-gnu/crosstool.config
+++ b/samples/mips-malta-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 d99ad7f3..7867b9c7 100644
--- a/samples/mips-unknown-elf/crosstool.config
+++ b/samples/mips-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_MIPS=y
 CT_ARCH_FLOAT_SW=y
 CT_LIBC_NONE=y
diff --git a/samples/mips-unknown-linux-gnu/crosstool.config b/samples/mips-unknown-linux-gnu/crosstool.config
index 315d20ca..ea78b70f 100644
--- a/samples/mips-unknown-linux-gnu/crosstool.config
+++ b/samples/mips-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_MIPS=y
 CT_ARCH_ARCH="mips1"
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/mips-unknown-linux-uclibc/crosstool.config b/samples/mips-unknown-linux-uclibc/crosstool.config
index 001a6413..882ceb07 100644
--- a/samples/mips-unknown-linux-uclibc/crosstool.config
+++ b/samples/mips-unknown-linux-uclibc/crosstool.config
@@ -1,10 +1,10 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_MIPS=y
 CT_ARCH_ARCH="mips1"
 CT_ARCH_FLOAT_SW=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_CC_GCC_mips_plt=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
diff --git a/samples/mips64-unknown-linux-gnu/crosstool.config b/samples/mips64-unknown-linux-gnu/crosstool.config
index a33fd90a..4b909ce1 100644
--- a/samples/mips64-unknown-linux-gnu/crosstool.config
+++ b/samples/mips64-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_MIPS=y
 CT_ARCH_mips_n64=y
 CT_ARCH_64=y
diff --git a/samples/mips64el-multilib-linux-uclibc/crosstool.config b/samples/mips64el-multilib-linux-uclibc/crosstool.config
index 72908e53..cf97348b 100644
--- a/samples/mips64el-multilib-linux-uclibc/crosstool.config
+++ b/samples/mips64el-multilib-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_MIPS=y
 CT_MULTILIB=y
 CT_ARCH_LE=y
@@ -7,7 +7,7 @@ CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="multilib"
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_GCC_mips_plt=y
 CT_CC_LANG_CXX=y
diff --git a/samples/mipsel-multilib-linux-gnu/crosstool.config b/samples/mipsel-multilib-linux-gnu/crosstool.config
index 6f1e65aa..7d54e2af 100644
--- a/samples/mipsel-multilib-linux-gnu/crosstool.config
+++ b/samples/mipsel-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 23a01a49..b3ff5af9 100644
--- a/samples/mipsel-sde-elf/crosstool.config
+++ b/samples/mipsel-sde-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 7d6c4f25..10085913 100644
--- a/samples/mipsel-unknown-linux-gnu/crosstool.config
+++ b/samples/mipsel-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 50e05346..03d81fc2 100644
--- a/samples/moxie-unknown-elf/crosstool.config
+++ b/samples/moxie-unknown-elf/crosstool.config
@@ -1,8 +1,7 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_EXPERIMENTAL=y
 CT_ARCH_MOXIE=y
 CT_DEBUG_GDB=y
 CT_GDB_CROSS_SIM=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_COMP_LIBS_LIBELF=y
-CT_DTC_VERBOSE=y
diff --git a/samples/moxiebox/crosstool.config b/samples/moxiebox/crosstool.config
index 2008fd5a..fe08882d 100644
--- a/samples/moxiebox/crosstool.config
+++ b/samples/moxiebox/crosstool.config
@@ -1,8 +1,7 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_EXPERIMENTAL=y
 CT_ARCH_MOXIE=y
 CT_ARCH_LE=y
 CT_DEBUG_GDB=y
 CT_GDB_CROSS_SIM=y
 # CT_GDB_CROSS_PYTHON is not set
-CT_DTC_VERBOSE=y
diff --git a/samples/msp430-unknown-elf/crosstool.config b/samples/msp430-unknown-elf/crosstool.config
index 7eb82c9a..6ca9e31e 100644
--- a/samples/msp430-unknown-elf/crosstool.config
+++ b/samples/msp430-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 c6f51c50..d038aac2 100644
--- a/samples/nios2-altera-linux-gnu/crosstool.config
+++ b/samples/nios2-altera-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 541a5c5c..2fe5d443 100644
--- a/samples/nios2-unknown-elf/crosstool.config
+++ b/samples/nios2-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 21de17a4..128570c3 100644
--- a/samples/powerpc-405-linux-gnu/crosstool.config
+++ b/samples/powerpc-405-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 d449c618..e6a0bf5d 100644
--- a/samples/powerpc-8540-linux-gnu/crosstool.config
+++ b/samples/powerpc-8540-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 f5a2b357..d34db5c7 100644
--- a/samples/powerpc-860-linux-gnu/crosstool.config
+++ b/samples/powerpc-860-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 b339e12a..131abd02 100644
--- a/samples/powerpc-e300c3-linux-gnu/crosstool.config
+++ b/samples/powerpc-e300c3-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 b85928eb..ef76f7dd 100644
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 67b36a9f..a515447c 100644
--- a/samples/powerpc-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 9c209fda..40736a5e 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="3"
+CT_CONFIG_VERSION="4"
 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 0950dcdc..a463464a 100644
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@@ -1,9 +1,9 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_POWERPC=y
 CT_ARCH_FLOAT_SW=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_FOR_TARGET=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_CC_LANG_CXX=y
 CT_CC_LANG_FORTRAN=y
 CT_DEBUG_DUMA=y
diff --git a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
index b2983bac..7c0d50be 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="3"
+CT_CONFIG_VERSION="4"
 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 05b97870..2e81f9aa 100644
--- a/samples/powerpc64-multilib-linux-gnu/crosstool.config
+++ b/samples/powerpc64-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 04696282..9dd482c6 100644
--- a/samples/powerpc64-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 95d80250..11229d3b 100644
--- a/samples/powerpc64le-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64le-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_POWERPC=y
 CT_ARCH_LE=y
 CT_ARCH_64=y
diff --git a/samples/pru/crosstool.config b/samples/pru/crosstool.config
index 2036c30b..23d24f4c 100644
--- a/samples/pru/crosstool.config
+++ b/samples/pru/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_PRU=y
 CT_OMIT_TARGET_VENDOR=y
 # CT_DEMULTILIB is not set
diff --git a/samples/riscv32-hifive1-elf/crosstool.config b/samples/riscv32-hifive1-elf/crosstool.config
index 49c93400..994cb337 100644
--- a/samples/riscv32-hifive1-elf/crosstool.config
+++ b/samples/riscv32-hifive1-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 1d68b8f6..96d665b0 100644
--- a/samples/riscv32-unknown-elf/crosstool.config
+++ b/samples/riscv32-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 87e9b717..4ee03576 100644
--- a/samples/riscv64-unknown-elf/crosstool.config
+++ b/samples/riscv64-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 c12993c2..e1457197 100644
--- a/samples/riscv64-unknown-linux-gnu/crosstool.config
+++ b/samples/riscv64-unknown-linux-gnu/crosstool.config
@@ -1,13 +1,12 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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_CC_LANG_CXX=y
 CT_KERNEL_LINUX=y
+CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 # CT_GDB_GDBSERVER is not set
-CT_ZLIB_NEEDED=y
diff --git a/samples/s390-ibm-linux-gnu/crosstool.config b/samples/s390-ibm-linux-gnu/crosstool.config
index 06fb9f6f..00c111a4 100644
--- a/samples/s390-ibm-linux-gnu/crosstool.config
+++ b/samples/s390-ibm-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_EXPERIMENTAL=y
 CT_ARCH_S390=y
 CT_TARGET_VENDOR="ibm"
diff --git a/samples/s390-unknown-linux-gnu/crosstool.config b/samples/s390-unknown-linux-gnu/crosstool.config
index bf6fbe03..ccf23340 100644
--- a/samples/s390-unknown-linux-gnu/crosstool.config
+++ b/samples/s390-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 8b4bb083..788bd1f4 100644
--- a/samples/s390x-ibm-linux-gnu/crosstool.config
+++ b/samples/s390x-ibm-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_S390=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="ibm"
diff --git a/samples/s390x-unknown-linux-gnu/crosstool.config b/samples/s390x-unknown-linux-gnu/crosstool.config
index 55b1622e..32989919 100644
--- a/samples/s390x-unknown-linux-gnu/crosstool.config
+++ b/samples/s390x-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 78e0ce48..0337ffd2 100644
--- a/samples/sh-multilib-linux-gnu/crosstool.config
+++ b/samples/sh-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 c4514f68..df09c37d 100644
--- a/samples/sh-multilib-linux-uclibc/crosstool.config
+++ b/samples/sh-multilib-linux-uclibc/crosstool.config
@@ -1,11 +1,11 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_SH=y
 CT_ARCH_CPU="sh4"
 CT_ARCH_LE_BE=y
 CT_TARGET_VENDOR="multilib"
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_CC_GCC_MULTILIB_LIST="sh3,sh4,sh4a,sh4a-nofpu"
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
diff --git a/samples/sh-unknown-elf/crosstool.config b/samples/sh-unknown-elf/crosstool.config
index cf06c371..00213ddb 100644
--- a/samples/sh-unknown-elf/crosstool.config
+++ b/samples/sh-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 88bb7a7e..411ea7f4 100644
--- a/samples/sparc-leon-linux-uclibc/crosstool.config
+++ b/samples/sparc-leon-linux-uclibc/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_SPARC=y
 CT_ARCH_CPU="leon"
 CT_ARCH_TUNE="leon"
@@ -6,7 +6,7 @@ CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="leon"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_3_10=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}.config"
 CT_LIBC_UCLIBC_IPV6=y
 CT_GCC_V_6=y
diff --git a/samples/sparc-unknown-linux-gnu/crosstool.config b/samples/sparc-unknown-linux-gnu/crosstool.config
index ee5191c7..93ac9222 100644
--- a/samples/sparc-unknown-linux-gnu/crosstool.config
+++ b/samples/sparc-unknown-linux-gnu/crosstool.config
@@ -1,3 +1,3 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 ea235633..d758f012 100644
--- a/samples/sparc64-multilib-linux-gnu/crosstool.config
+++ b/samples/sparc64-multilib-linux-gnu/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_SPARC=y
 CT_MULTILIB=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 08319709..cfe8fa42 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="3"
+CT_CONFIG_VERSION="4"
 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 b5814563..b19920de 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="3"
+CT_CONFIG_VERSION="4"
 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 83edf11d..0fe7cda2 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="3"
+CT_CONFIG_VERSION="4"
 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 5fd79e4d..ed795f33 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="3"
+CT_CONFIG_VERSION="4"
 CT_EXPERIMENTAL=y
 CT_ARCH_MOXIE=y
 CT_CANADIAN=y
@@ -7,4 +7,3 @@ CT_DEBUG_GDB=y
 CT_GDB_CROSS_SIM=y
 # CT_LIBICONV_NEEDED is not set
 # CT_GETTEXT_NEEDED is not set
-CT_DTC_VERBOSE=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 07c01554..ee02ef7c 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="3"
+CT_CONFIG_VERSION="4"
 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 01363763..50c5d3bb 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="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_X86=y
 CT_MULTILIB=y
 CT_ARCH_64=y
@@ -9,7 +9,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=y
diff --git a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
deleted file mode 100644
index 45d80bc9..00000000
--- a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
+++ /dev/null
@@ -1,10 +0,0 @@
-CT_CONFIG_VERSION="3"
-CT_OBSOLETE=y
-CT_ARCH_X86=y
-CT_ARCH_64=y
-CT_TARGET_VENDOR="ubuntu12.04"
-CT_KERNEL_LINUX=y
-CT_LINUX_V_3_2=y
-# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_GLIBC_V_2_15=y
-CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-ubuntu12.04-linux-gnu/reported.by b/samples/x86_64-ubuntu12.04-linux-gnu/reported.by
deleted file mode 100644
index d060e03c..00000000
--- a/samples/x86_64-ubuntu12.04-linux-gnu/reported.by
+++ /dev/null
@@ -1,3 +0,0 @@
-reporter_name="Alexey Neyman"
-reporter_url=""
-reporter_comment="x86_64 kernel/libc matching Ubuntu 12.04 LTS."
diff --git a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
index 535df2b9..15380f0d 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="3"
+CT_CONFIG_VERSION="4"
 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 4948c001..b30e6d1c 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="3"
+CT_CONFIG_VERSION="4"
 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 27637ed9..ec8f38f3 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="3"
+CT_CONFIG_VERSION="4"
 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 9b1687ef..9edc8d3d 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="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_X86=y
 CT_ARCH_64=y
 CT_KERNEL_LINUX=y
@@ -7,7 +7,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=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 638c6c19..b93a99b8 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="3"
+CT_CONFIG_VERSION="4"
 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 64cfbcdb..cf53af7f 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="3"
+CT_CONFIG_VERSION="4"
 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 40cbe128..470be44d 100644
--- a/samples/x86_64-w64-mingw32/crosstool.config
+++ b/samples/x86_64-w64-mingw32/crosstool.config
@@ -1,4 +1,4 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 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 1caffd1f..2ddf9a0a 100644
--- a/samples/xtensa-fsf-elf/crosstool.config
+++ b/samples/xtensa-fsf-elf/crosstool.config
@@ -1,4 +1,5 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
+CT_OBSOLETE=y
 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 3c524b0c..0e821cbc 100644
--- a/samples/xtensa-fsf-linux-uclibc/crosstool.config
+++ b/samples/xtensa-fsf-linux-uclibc/crosstool.config
@@ -1,9 +1,9 @@
-CT_CONFIG_VERSION="3"
+CT_CONFIG_VERSION="4"
 CT_ARCH_XTENSA=y
 CT_ARCH_BE=y
 CT_TARGET_CFLAGS="-mlongcalls -mtext-section-literals"
 CT_TARGET_VENDOR="fsf"
 CT_KERNEL_LINUX=y
-CT_LIBC_UCLIBC=y
+CT_LIBC_UCLIBC_NG=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y