aboutsummaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
Diffstat (limited to 'samples')
-rw-r--r--samples/aarch64-rpi3-linux-gnu/crosstool.config (renamed from samples/aarch64-rpi3-linux-gnueabi/crosstool.config)9
-rw-r--r--samples/aarch64-rpi3-linux-gnu/reported.by (renamed from samples/aarch64-rpi3-linux-gnueabi/reported.by)2
-rw-r--r--samples/aarch64-unknown-linux-android/crosstool.config7
-rw-r--r--samples/aarch64-unknown-linux-gnu/crosstool.config (renamed from samples/aarch64-unknown-linux-gnueabi/crosstool.config)7
-rw-r--r--samples/aarch64-unknown-linux-gnu/reported.by (renamed from samples/aarch64-unknown-linux-gnueabi/reported.by)2
-rw-r--r--samples/aarch64-unknown-linux-uclibc/crosstool.config (renamed from samples/aarch64-unknown-linux-uclibcgnueabi/crosstool.config)10
-rw-r--r--samples/aarch64-unknown-linux-uclibc/reported.by (renamed from samples/aarch64-unknown-linux-uclibcgnueabi/reported.by)0
-rw-r--r--samples/alphaev56-unknown-linux-gnu/crosstool.config3
-rw-r--r--samples/alphaev67-unknown-linux-gnu/crosstool.config3
-rw-r--r--samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config6
-rw-r--r--samples/arm-cortex_a15-linux-gnueabihf/crosstool.config12
-rw-r--r--samples/arm-cortex_a8-linux-gnueabi/crosstool.config13
-rw-r--r--samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config15
-rw-r--r--samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config15
-rw-r--r--samples/arm-multilib-linux-uclibcgnueabi/crosstool.config10
-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.config13
-rw-r--r--samples/arm-unknown-linux-musleabi/crosstool.config12
-rw-r--r--samples/arm-unknown-linux-uclibcgnueabi/crosstool.config14
-rw-r--r--samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config14
-rw-r--r--samples/armeb-unknown-eabi/crosstool.config6
-rw-r--r--samples/armeb-unknown-linux-gnueabi/crosstool.config13
-rw-r--r--samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config14
-rw-r--r--samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config7
-rw-r--r--samples/armv6-rpi-linux-gnueabi/crosstool.config18
-rw-r--r--samples/armv7-rpi2-linux-gnueabihf/crosstool.config9
-rw-r--r--samples/armv8-rpi3-linux-gnueabihf/crosstool.config9
-rw-r--r--samples/avr/crosstool.config4
-rw-r--r--samples/i586-geode-linux-uclibc/crosstool.config13
-rw-r--r--samples/i686-centos6-linux-gnu/crosstool.config9
-rw-r--r--samples/i686-centos7-linux-gnu/crosstool.config9
-rw-r--r--samples/i686-nptl-linux-gnu/crosstool.config13
-rw-r--r--samples/i686-ubuntu12.04-linux-gnu/crosstool.config9
-rw-r--r--samples/i686-ubuntu14.04-linux-gnu/crosstool.config9
-rw-r--r--samples/i686-ubuntu16.04-linux-gnu/crosstool.config9
-rw-r--r--samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config4
-rw-r--r--samples/i686-w64-mingw32/crosstool.config4
-rw-r--r--samples/m68k-unknown-elf/crosstool.config10
-rw-r--r--samples/m68k-unknown-uclinux-uclibc/crosstool.config4
-rw-r--r--samples/mips-ar2315-linux-gnu/crosstool.config9
-rw-r--r--samples/mips-malta-linux-gnu/crosstool.config7
-rw-r--r--samples/mips-unknown-elf/crosstool.config6
-rw-r--r--samples/mips-unknown-linux-uclibc/crosstool.config11
-rw-r--r--samples/mips64el-multilib-linux-uclibc/crosstool.config6
-rw-r--r--samples/mipsel-multilib-linux-gnu/crosstool.config11
-rw-r--r--samples/mipsel-sde-elf/crosstool.config6
-rw-r--r--samples/mipsel-unknown-linux-gnu/crosstool.config11
-rw-r--r--samples/msp430-unknown-elf/crosstool.config6
-rw-r--r--samples/nios2-altera-linux-gnu/crosstool.config7
-rw-r--r--samples/nios2-altera-linux-gnu/reported.by3
-rw-r--r--samples/nios2-unknown-elf/crosstool.config4
-rw-r--r--samples/nios2-unknown-elf/reported.by3
-rw-r--r--samples/powerpc-405-linux-gnu/crosstool.config6
-rw-r--r--samples/powerpc-860-linux-gnu/crosstool.config8
-rw-r--r--samples/powerpc-e300c3-linux-gnu/crosstool.config4
-rw-r--r--samples/powerpc-e500v2-linux-gnuspe/crosstool.config9
-rw-r--r--samples/powerpc-unknown-linux-gnu/crosstool.config10
-rw-r--r--samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config4
-rw-r--r--samples/powerpc-unknown-linux-uclibc/crosstool.config13
-rw-r--r--samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config10
-rw-r--r--samples/powerpc64-multilib-linux-gnu/crosstool.config6
-rw-r--r--samples/powerpc64-unknown-linux-gnu/crosstool.config6
-rw-r--r--samples/powerpc64le-unknown-linux-gnu/crosstool.config6
-rw-r--r--samples/s390-ibm-linux-gnu/crosstool.config4
-rw-r--r--samples/s390x-ibm-linux-gnu/crosstool.config4
-rw-r--r--samples/sh-multilib-linux-gnu/crosstool.config10
-rw-r--r--samples/sh-multilib-linux-gnu/reported.by (renamed from samples/sh4-multilib-linux-gnu/reported.by)0
-rw-r--r--samples/sh-multilib-linux-uclibc/crosstool.config11
-rw-r--r--samples/sh-multilib-linux-uclibc/reported.by (renamed from samples/sh4-multilib-linux-uclibc/reported.by)0
-rw-r--r--samples/sh-unknown-elf/crosstool.config5
-rw-r--r--samples/sh-unknown-elf/reported.by3
-rw-r--r--samples/sh4-multilib-linux-gnu/crosstool.config9
-rw-r--r--samples/sh4-multilib-linux-uclibc/crosstool.config11
-rw-r--r--samples/sh4-unknown-linux-gnu/crosstool.config7
-rw-r--r--samples/sh4-unknown-linux-gnu/reported.by3
-rw-r--r--samples/sparc-leon-linux-uclibc/crosstool.config15
-rw-r--r--samples/sparc-unknown-linux-gnu/crosstool.config4
-rw-r--r--samples/sparc64-multilib-linux-gnu/crosstool.config4
-rw-r--r--samples/x86_64-centos6-linux-gnu/crosstool.config9
-rw-r--r--samples/x86_64-centos7-linux-gnu/crosstool.config9
-rw-r--r--samples/x86_64-multilib-linux-gnu/crosstool.config9
-rw-r--r--samples/x86_64-multilib-linux-musl/crosstool.config10
-rw-r--r--samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config9
-rw-r--r--samples/x86_64-multilib-linux-uclibc/crosstool.config11
-rw-r--r--samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config9
-rw-r--r--samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config9
-rw-r--r--samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config9
-rw-r--r--samples/x86_64-unknown-linux-gnu/crosstool.config9
-rw-r--r--samples/x86_64-unknown-linux-uclibc/crosstool.config11
-rw-r--r--samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config16
-rw-r--r--samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config14
-rw-r--r--samples/x86_64-w64-mingw32/crosstool.config4
-rw-r--r--samples/xtensa-fsf-linux-uclibc/crosstool.config9
94 files changed, 362 insertions, 391 deletions
diff --git a/samples/aarch64-rpi3-linux-gnueabi/crosstool.config b/samples/aarch64-rpi3-linux-gnu/crosstool.config
index 6d51c12e..f8ef63da 100644
--- a/samples/aarch64-rpi3-linux-gnueabi/crosstool.config
+++ b/samples/aarch64-rpi3-linux-gnu/crosstool.config
@@ -1,12 +1,11 @@
-CT_ARCH_arm=y
-CT_ARCH_64=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a53"
+CT_ARCH_64=y
CT_TARGET_VENDOR="rpi3"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/aarch64-rpi3-linux-gnueabi/reported.by b/samples/aarch64-rpi3-linux-gnu/reported.by
index 0b99105e..a7cdf732 100644
--- a/samples/aarch64-rpi3-linux-gnueabi/reported.by
+++ b/samples/aarch64-rpi3-linux-gnu/reported.by
@@ -1,3 +1,3 @@
reporter_name="Bryan Hundven"
-reporter_url="https://github.com/crosstool-ng/crosstool-ng/issues"
+reporter_url=""
reporter_comment="Raspberry PI 3 aarch64"
diff --git a/samples/aarch64-unknown-linux-android/crosstool.config b/samples/aarch64-unknown-linux-android/crosstool.config
index 295b219a..0e8a6f86 100644
--- a/samples/aarch64-unknown-linux-android/crosstool.config
+++ b/samples/aarch64-unknown-linux-android/crosstool.config
@@ -1,11 +1,10 @@
CT_EXPERIMENTAL=y
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_64=y
CT_ARCH_ARCH="armv8-a"
CT_STATIC_TOOLCHAIN=y
-CT_KERNEL_linux=y
-CT_LIBC_BIONIC_V_14b=y
+CT_KERNEL_LINUX=y
CT_ANDROID_API_21=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
CT_GETTEXT=y
diff --git a/samples/aarch64-unknown-linux-gnueabi/crosstool.config b/samples/aarch64-unknown-linux-gnu/crosstool.config
index 8ff183c4..898e4e4a 100644
--- a/samples/aarch64-unknown-linux-gnueabi/crosstool.config
+++ b/samples/aarch64-unknown-linux-gnu/crosstool.config
@@ -1,11 +1,10 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_64=y
CT_TARGET_VENDOR=""
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/aarch64-unknown-linux-gnueabi/reported.by b/samples/aarch64-unknown-linux-gnu/reported.by
index 37668de8..224868bf 100644
--- a/samples/aarch64-unknown-linux-gnueabi/reported.by
+++ b/samples/aarch64-unknown-linux-gnu/reported.by
@@ -1,3 +1,3 @@
reporter_name="Bryan Hundven"
-reporter_url="https://github.com/crosstool-ng/crosstool-ng/issues"
+reporter_url=""
reporter_comment="Generic aarch64 toolchain"
diff --git a/samples/aarch64-unknown-linux-uclibcgnueabi/crosstool.config b/samples/aarch64-unknown-linux-uclibc/crosstool.config
index ebc05244..fdda4498 100644
--- a/samples/aarch64-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/aarch64-unknown-linux-uclibc/crosstool.config
@@ -1,14 +1,14 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_64=y
CT_TARGET_VENDOR=""
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
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=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
CT_GETTEXT=y
diff --git a/samples/aarch64-unknown-linux-uclibcgnueabi/reported.by b/samples/aarch64-unknown-linux-uclibc/reported.by
index d4dfbc24..d4dfbc24 100644
--- a/samples/aarch64-unknown-linux-uclibcgnueabi/reported.by
+++ b/samples/aarch64-unknown-linux-uclibc/reported.by
diff --git a/samples/alphaev56-unknown-linux-gnu/crosstool.config b/samples/alphaev56-unknown-linux-gnu/crosstool.config
index 67a58079..321e957e 100644
--- a/samples/alphaev56-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config
@@ -1,5 +1,4 @@
-CT_ARCH_CPU="ev56"
CT_ARCH_ALPHA_EV56=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
diff --git a/samples/alphaev67-unknown-linux-gnu/crosstool.config b/samples/alphaev67-unknown-linux-gnu/crosstool.config
index 41cc7534..485bd2d5 100644
--- a/samples/alphaev67-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev67-unknown-linux-gnu/crosstool.config
@@ -1,6 +1,5 @@
-CT_ARCH_CPU="ev67"
CT_ARCH_ALPHA_EV67=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
# CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
CT_CC_LANG_CXX=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 c570a1e5..09cae2b2 100644
--- a/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
+++ b/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
@@ -1,8 +1,8 @@
-CT_ARCH_arm=y
-# CT_ARCH_USE_MMU is not set
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-m3"
-CT_ARCH_FLOAT_SW=y
CT_ARCH_ARM_MODE_THUMB=y
+# CT_ARCH_USE_MMU is not set
+CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="bare_newlib_cortex_m3_nommu"
CT_ARCH_BINFMT_FLAT=y
CT_LIBC_NEWLIB_IO_C99FMT=y
diff --git a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
index 76174b62..491046d9 100644
--- a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
@@ -1,18 +1,16 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a15"
CT_ARCH_FPU="neon-vfpv4"
CT_ARCH_FLOAT_HW=y
CT_TARGET_VENDOR="cortex_a15"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_CC_GCC_SHOW_LINARO=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
index 7b7a74bb..3e4c024b 100644
--- a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
+++ b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
@@ -1,17 +1,16 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a8"
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="cortex_a8"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
index 980d03f6..49e842ca 100644
--- a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
@@ -1,20 +1,19 @@
CT_EXPERIMENTAL=y
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a5"
CT_ARCH_FPU="vfpv4-d16"
CT_ARCH_FLOAT_HW=y
CT_TARGET_VENDOR="cortexa5"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
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_WCHAR=y
+CT_LIBC_UCLIBC=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
CT_GDB_CROSS_STATIC=y
CT_GDB_NATIVE=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
index f5a57dd1..83f781f4 100644
--- a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
@@ -1,23 +1,22 @@
CT_EXPERIMENTAL=y
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a9"
CT_ARCH_FPU="neon"
CT_ARCH_FLOAT_HW=y
CT_TARGET_VENDOR="cortexa9_neon"
CT_TOOLCHAIN_ENABLE_NLS=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_LIBC_ADDONS_LIST="libidn"
-CT_LIBC_LOCALES=y
-CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y
-CT_CC_GCC_SHOW_LINARO=y
+CT_LIBC_GLIBC=y
+CT_GLIBC_USE_LIBIDN_ADDON=y
+CT_GLIBC_LOCALES=y
+CT_GLIBC_KERNEL_VERSION_NONE=y
# CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
CT_GDB_NATIVE_STATIC=y
diff --git a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
index 00ac47be..6dc39fac 100644
--- a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
@@ -1,15 +1,15 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_MULTILIB=y
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
# CT_SHARED_LIBS is not set
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=y
CT_THREADS_NONE=y
CT_CC_GCC_MULTILIB_LIST="aprofile"
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-nano-eabi/crosstool.config b/samples/arm-nano-eabi/crosstool.config
index a00b6a2e..82e57140 100644
--- a/samples/arm-nano-eabi/crosstool.config
+++ b/samples/arm-nano-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_MULTILIB=y
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="nano"
diff --git a/samples/arm-unknown-eabi/crosstool.config b/samples/arm-unknown-eabi/crosstool.config
index a22ac4a0..f52abecc 100644
--- a/samples/arm-unknown-eabi/crosstool.config
+++ b/samples/arm-unknown-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_FLOAT_SW=y
CT_LIBC_NEWLIB_IO_C99FMT=y
CT_LIBC_NEWLIB_IO_LL=y
diff --git a/samples/arm-unknown-linux-gnueabi/crosstool.config b/samples/arm-unknown-linux-gnueabi/crosstool.config
index 20157cfb..128d3799 100644
--- a/samples/arm-unknown-linux-gnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-gnueabi/crosstool.config
@@ -1,17 +1,16 @@
# CT_REMOVE_DOCS is not set
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
# CT_CC_GCC_SJLJ_EXCEPTIONS is not set
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-unknown-linux-musleabi/crosstool.config b/samples/arm-unknown-linux-musleabi/crosstool.config
index e2335a71..c3846110 100644
--- a/samples/arm-unknown-linux-musleabi/crosstool.config
+++ b/samples/arm-unknown-linux-musleabi/crosstool.config
@@ -1,14 +1,14 @@
CT_EXPERIMENTAL=y
-CT_ARCH_arm=y
-CT_KERNEL_linux=y
+CT_ARCH_ARM=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_BINUTILS_FOR_TARGET=y
-CT_LIBC_musl=y
+CT_LIBC_MUSL=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
index c2b48236..2993b995 100644
--- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,16 +1,16 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="arm926ej-s"
CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
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=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
CT_GDB_CROSS_STATIC=y
CT_GDB_NATIVE=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
index d3279743..3fd2d2d7 100644
--- a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
@@ -1,18 +1,18 @@
CT_EXPERIMENTAL=y
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="arm926ej-s"
CT_ARCH_FLOAT_HW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
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=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
CT_GDB_CROSS_STATIC=y
CT_GDB_NATIVE=y
CT_GDB_NATIVE_STATIC=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/armeb-unknown-eabi/crosstool.config b/samples/armeb-unknown-eabi/crosstool.config
index ce975a85..c6779f80 100644
--- a/samples/armeb-unknown-eabi/crosstool.config
+++ b/samples/armeb-unknown-eabi/crosstool.config
@@ -1,11 +1,11 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_BE=y
CT_ARCH_FLOAT_SW=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_none=y
+CT_LIBC_NONE=y
# CT_CC_GCC_USE_GRAPHITE is not set
# CT_CC_GCC_USE_LTO is not set
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/armeb-unknown-linux-gnueabi/crosstool.config b/samples/armeb-unknown-linux-gnueabi/crosstool.config
index 983c33da..22d7d9f3 100644
--- a/samples/armeb-unknown-linux-gnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config
@@ -1,18 +1,17 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_BE=y
CT_ARCH_ARCH="armv5te"
CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
# CT_CC_GCC_SJLJ_EXCEPTIONS is not set
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
index 8f4d6888..c2b21f88 100644
--- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,17 +1,17 @@
-CT_ARCH_arm=y
-CT_ARCH_BE=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="xscale"
+CT_ARCH_BE=y
CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
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=y
# CT_CC_GCC_SJLJ_EXCEPTIONS is not set
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
index 398a550b..4b0c04b6 100644
--- a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
@@ -1,13 +1,12 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_SUFFIX="v6"
# CT_ARCH_USE_MMU is not set
CT_TARGET_VENDOR="nommu"
-CT_KERNEL_linux=y
-# CT_SHARED_LIBS is not set
+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_SHOW_LINARO=y
CT_CC_GCC_DISABLE_PCH=y
CT_CC_GCC_BUILD_ID=y
CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
diff --git a/samples/armv6-rpi-linux-gnueabi/crosstool.config b/samples/armv6-rpi-linux-gnueabi/crosstool.config
index 22fbfaac..94f1b2a1 100644
--- a/samples/armv6-rpi-linux-gnueabi/crosstool.config
+++ b/samples/armv6-rpi-linux-gnueabi/crosstool.config
@@ -1,22 +1,20 @@
-CT_ARCH_arm=y
-CT_ARCH_SUFFIX="v6"
+CT_ARCH_ARM=y
CT_ARCH_CPU="arm1176jzf-s"
+CT_ARCH_SUFFIX="v6"
CT_ARCH_FPU="vfp"
CT_TARGET_VENDOR="rpi"
-CT_KERNEL_linux=y
-CT_KERNEL_V_3_12=y
+CT_KERNEL_LINUX=y
+CT_LINUX_V_3_12=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_LIBC_LOCALES=y
-CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_LIBC_GLIBC_MIN_KERNEL_VERSION="3.2.27"
-CT_CC_GCC_SHOW_LINARO=y
+CT_GLIBC_LOCALES=y
+CT_GLIBC_KERNEL_VERSION_CHOSEN=y
+CT_GLIBC_MIN_KERNEL_VERSION="3.2.27"
CT_CC_GCC_DISABLE_PCH=y
CT_CC_GCC_BUILD_ID=y
CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
index 30b678dc..102c5032 100644
--- a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
+++ b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
@@ -1,14 +1,13 @@
-CT_ARCH_arm=y
-CT_ARCH_SUFFIX="v7"
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a7"
+CT_ARCH_SUFFIX="v7"
CT_ARCH_FPU="neon-vfpv4"
CT_ARCH_FLOAT_HW=y
CT_TARGET_VENDOR="rpi2"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
index 6d1d0f8f..fe9b5af1 100644
--- a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
+++ b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
@@ -1,14 +1,13 @@
-CT_ARCH_arm=y
-CT_ARCH_SUFFIX="v8"
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a53"
+CT_ARCH_SUFFIX="v8"
CT_ARCH_FPU="neon-vfpv4"
CT_ARCH_FLOAT_HW=y
CT_TARGET_VENDOR="rpi3"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/avr/crosstool.config b/samples/avr/crosstool.config
index 3a3016f4..6283c78c 100644
--- a/samples/avr/crosstool.config
+++ b/samples/avr/crosstool.config
@@ -1,3 +1,3 @@
-CT_ARCH_avr=y
+CT_ARCH_AVR=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/i586-geode-linux-uclibc/crosstool.config b/samples/i586-geode-linux-uclibc/crosstool.config
index 5dc1cc4e..08f90f5d 100644
--- a/samples/i586-geode-linux-uclibc/crosstool.config
+++ b/samples/i586-geode-linux-uclibc/crosstool.config
@@ -1,16 +1,15 @@
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_ARCH="pentium-mmx"
CT_TARGET_VENDOR="geode"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
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_WCHAR=y
+CT_LIBC_UCLIBC=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/i686-centos6-linux-gnu/crosstool.config b/samples/i686-centos6-linux-gnu/crosstool.config
index 86ec1f65..c2858930 100644
--- a/samples/i686-centos6-linux-gnu/crosstool.config
+++ b/samples/i686-centos6-linux-gnu/crosstool.config
@@ -1,10 +1,9 @@
CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_ARCH="i686"
CT_TARGET_VENDOR="centos6"
-CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_32=y
-CT_LIBC_glibc=y
+CT_KERNEL_LINUX=y
+CT_LINUX_V_2_6_32=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_12_2=y
+CT_GLIBC_V_2_12_2=y
CT_CC_LANG_CXX=y
diff --git a/samples/i686-centos7-linux-gnu/crosstool.config b/samples/i686-centos7-linux-gnu/crosstool.config
index b6403bbb..498afcce 100644
--- a/samples/i686-centos7-linux-gnu/crosstool.config
+++ b/samples/i686-centos7-linux-gnu/crosstool.config
@@ -1,10 +1,9 @@
CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_ARCH="i686"
CT_TARGET_VENDOR="centos7"
-CT_KERNEL_linux=y
-CT_KERNEL_V_3_10=y
-CT_LIBC_glibc=y
+CT_KERNEL_LINUX=y
+CT_LINUX_V_3_10=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_17=y
+CT_GLIBC_V_2_17=y
CT_CC_LANG_CXX=y
diff --git a/samples/i686-nptl-linux-gnu/crosstool.config b/samples/i686-nptl-linux-gnu/crosstool.config
index 1f14d67f..48df3304 100644
--- a/samples/i686-nptl-linux-gnu/crosstool.config
+++ b/samples/i686-nptl-linux-gnu/crosstool.config
@@ -1,16 +1,15 @@
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_ARCH="i686"
CT_TARGET_VENDOR="nptl"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
index 01c43127..958825d0 100644
--- a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
@@ -1,10 +1,9 @@
CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_ARCH="i686"
CT_TARGET_VENDOR="ubuntu12.04"
-CT_KERNEL_linux=y
-CT_KERNEL_V_3_2=y
-CT_LIBC_glibc=y
+CT_KERNEL_LINUX=y
+CT_LINUX_V_3_2=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_15=y
+CT_GLIBC_V_2_15=y
CT_CC_LANG_CXX=y
diff --git a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
index e3f459bc..339c4c69 100644
--- a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
@@ -1,10 +1,9 @@
CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_ARCH="i686"
CT_TARGET_VENDOR="ubuntu14.04"
-CT_KERNEL_linux=y
-CT_KERNEL_V_3_13=y
-CT_LIBC_glibc=y
+CT_KERNEL_LINUX=y
+CT_LINUX_V_3_13=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_19=y
+CT_GLIBC_V_2_19=y
CT_CC_LANG_CXX=y
diff --git a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
index 9eec3c19..e7f381eb 100644
--- a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
@@ -1,10 +1,9 @@
CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_ARCH="i686"
CT_TARGET_VENDOR="ubuntu16.04"
-CT_KERNEL_linux=y
-CT_KERNEL_V_4_4=y
-CT_LIBC_glibc=y
+CT_KERNEL_LINUX=y
+CT_LINUX_V_4_4=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_23=y
+CT_GLIBC_V_2_23=y
CT_CC_LANG_CXX=y
diff --git a/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
index f3cd8e57..c3df4add 100644
--- a/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
+++ b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
@@ -1,10 +1,10 @@
CT_EXPERIMENTAL=y
# CT_REMOVE_DOCS is not set
-CT_ARCH_nios2=y
+CT_ARCH_NIOS2=y
CT_STATIC_TOOLCHAIN=y
CT_TOOLCHAIN_BUGURL="https://bitbucket.org/netzimme/eax-gcc/issues?status=new&status=open"
CT_TARGET_VENDOR="spico"
CT_CANADIAN=y
CT_HOST="i686-w64-mingw32"
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/i686-w64-mingw32/crosstool.config b/samples/i686-w64-mingw32/crosstool.config
index 4d2c99c8..5ed39c09 100644
--- a/samples/i686-w64-mingw32/crosstool.config
+++ b/samples/i686-w64-mingw32/crosstool.config
@@ -1,8 +1,8 @@
CT_EXPERIMENTAL=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_ARCH="i686"
CT_TARGET_VENDOR="w64"
-CT_KERNEL_windows=y
+CT_KERNEL_WINDOWS=y
CT_BINUTILS_PLUGINS=y
CT_MINGW_DIRECTX=y
CT_MINGW_DDK=y
diff --git a/samples/m68k-unknown-elf/crosstool.config b/samples/m68k-unknown-elf/crosstool.config
index 9b935839..227d45b6 100644
--- a/samples/m68k-unknown-elf/crosstool.config
+++ b/samples/m68k-unknown-elf/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_m68k=y
+CT_ARCH_M68K=y
CT_ARCH_CPU="cpu32"
CT_ARCH_BINFMT_FLAT=y
-CT_LIBC_none=y
+CT_LIBC_NONE=y
# CT_CC_GCC_USE_GRAPHITE is not set
# CT_CC_GCC_USE_LTO is not set
-CT_COMP_TOOLS_autoconf=y
-CT_COMP_TOOLS_automake=y
-CT_COMP_TOOLS_libtool=y
+CT_COMP_TOOLS_AUTOCONF=y
+CT_COMP_TOOLS_AUTOMAKE=y
+CT_COMP_TOOLS_LIBTOOL=y
diff --git a/samples/m68k-unknown-uclinux-uclibc/crosstool.config b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
index ab0fbe58..61c37f18 100644
--- a/samples/m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
@@ -1,3 +1,3 @@
-CT_ARCH_m68k=y
-CT_KERNEL_linux=y
+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 55ae9353..f9e79d7e 100644
--- a/samples/mips-ar2315-linux-gnu/crosstool.config
+++ b/samples/mips-ar2315-linux-gnu/crosstool.config
@@ -1,12 +1,11 @@
-CT_ARCH_mips=y
-CT_ARCH_ARCH="4kc"
+CT_ARCH_MIPS=y
CT_ARCH_TUNE="4kc"
+CT_ARCH_ARCH="4kc"
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="ar2315"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_GCC_mips_plt=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/mips-malta-linux-gnu/crosstool.config b/samples/mips-malta-linux-gnu/crosstool.config
index 624d01d1..a0639080 100644
--- a/samples/mips-malta-linux-gnu/crosstool.config
+++ b/samples/mips-malta-linux-gnu/crosstool.config
@@ -1,9 +1,8 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
CT_TARGET_VENDOR="malta"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_GCC_mips_plt=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/mips-unknown-elf/crosstool.config b/samples/mips-unknown-elf/crosstool.config
index 658b3ef5..133d27ea 100644
--- a/samples/mips-unknown-elf/crosstool.config
+++ b/samples/mips-unknown-elf/crosstool.config
@@ -1,6 +1,6 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
CT_ARCH_FLOAT_SW=y
-CT_LIBC_none=y
+CT_LIBC_NONE=y
CT_CC_GCC_mips_plt=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/mips-unknown-linux-uclibc/crosstool.config b/samples/mips-unknown-linux-uclibc/crosstool.config
index c693e8b3..a4cd5ce0 100644
--- a/samples/mips-unknown-linux-uclibc/crosstool.config
+++ b/samples/mips-unknown-linux-uclibc/crosstool.config
@@ -1,12 +1,11 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
CT_ARCH_ARCH="mips1"
CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
-CT_LIBC_UCLIBC_WCHAR=y
+CT_LIBC_UCLIBC=y
CT_CC_GCC_mips_plt=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/mips64el-multilib-linux-uclibc/crosstool.config b/samples/mips64el-multilib-linux-uclibc/crosstool.config
index f4d8e66f..faeab875 100644
--- a/samples/mips64el-multilib-linux-uclibc/crosstool.config
+++ b/samples/mips64el-multilib-linux-uclibc/crosstool.config
@@ -1,12 +1,12 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
CT_MULTILIB=y
CT_ARCH_LE=y
CT_ARCH_64=y
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=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 6f767a36..9257801c 100644
--- a/samples/mipsel-multilib-linux-gnu/crosstool.config
+++ b/samples/mipsel-multilib-linux-gnu/crosstool.config
@@ -1,17 +1,16 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
CT_MULTILIB=y
CT_ARCH_LE=y
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-targets=all"
CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-targets=all"
CT_CC_GCC_mips_plt=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/mipsel-sde-elf/crosstool.config b/samples/mipsel-sde-elf/crosstool.config
index f5cac25d..8e89c90e 100644
--- a/samples/mipsel-sde-elf/crosstool.config
+++ b/samples/mipsel-sde-elf/crosstool.config
@@ -1,8 +1,8 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
CT_ARCH_LE=y
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="sde"
-CT_LIBC_none=y
+CT_LIBC_NONE=y
# CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/mipsel-unknown-linux-gnu/crosstool.config b/samples/mipsel-unknown-linux-gnu/crosstool.config
index 11320bfd..5458b7e7 100644
--- a/samples/mipsel-unknown-linux-gnu/crosstool.config
+++ b/samples/mipsel-unknown-linux-gnu/crosstool.config
@@ -1,14 +1,13 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
CT_ARCH_LE=y
CT_ARCH_ARCH="mips1"
CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_GCC_mips_plt=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/msp430-unknown-elf/crosstool.config b/samples/msp430-unknown-elf/crosstool.config
index 5e979e16..52c53bae 100644
--- a/samples/msp430-unknown-elf/crosstool.config
+++ b/samples/msp430-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
CT_EXPERIMENTAL=y
-CT_ARCH_msp430=y
-CT_CC_GCC_V_4_9_4=y
-CT_DEBUG_gdb=y
+CT_ARCH_MSP430=y
+CT_GCC_V_4_9_4=y
+CT_DEBUG_GDB=y
diff --git a/samples/nios2-altera-linux-gnu/crosstool.config b/samples/nios2-altera-linux-gnu/crosstool.config
new file mode 100644
index 00000000..0b87b577
--- /dev/null
+++ b/samples/nios2-altera-linux-gnu/crosstool.config
@@ -0,0 +1,7 @@
+CT_ARCH_NIOS2=y
+CT_ARCH_USE_MMU=y
+CT_TARGET_VENDOR="altera"
+CT_KERNEL_LINUX=y
+CT_CC_LANG_CXX=y
+CT_DEBUG_GDB=y
+# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/nios2-altera-linux-gnu/reported.by b/samples/nios2-altera-linux-gnu/reported.by
new file mode 100644
index 00000000..52814ae5
--- /dev/null
+++ b/samples/nios2-altera-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="makoehr@github"
+reporter_url=""
+reporter_comment="Sample configuration for Altera NIOS II with MMU."
diff --git a/samples/nios2-unknown-elf/crosstool.config b/samples/nios2-unknown-elf/crosstool.config
new file mode 100644
index 00000000..16573097
--- /dev/null
+++ b/samples/nios2-unknown-elf/crosstool.config
@@ -0,0 +1,4 @@
+CT_ARCH_NIOS2=y
+CT_CC_LANG_CXX=y
+CT_DEBUG_GDB=y
+# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/nios2-unknown-elf/reported.by b/samples/nios2-unknown-elf/reported.by
new file mode 100644
index 00000000..43479398
--- /dev/null
+++ b/samples/nios2-unknown-elf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Kirill K. Smirnov"
+reporter_url=""
+reporter_comment="Toolchain for NIOS2 bare metal targets"
diff --git a/samples/powerpc-405-linux-gnu/crosstool.config b/samples/powerpc-405-linux-gnu/crosstool.config
index eeddbac2..0e22d926 100644
--- a/samples/powerpc-405-linux-gnu/crosstool.config
+++ b/samples/powerpc-405-linux-gnu/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
CT_ARCH_CPU="405"
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="405"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/powerpc-860-linux-gnu/crosstool.config b/samples/powerpc-860-linux-gnu/crosstool.config
index eae5f91f..6f1db15b 100644
--- a/samples/powerpc-860-linux-gnu/crosstool.config
+++ b/samples/powerpc-860-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
CT_ARCH_CPU="860"
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="860"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY="--without-fp"
+CT_GLIBC_EXTRA_CONFIG_ARRAY="--without-fp"
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/powerpc-e300c3-linux-gnu/crosstool.config b/samples/powerpc-e300c3-linux-gnu/crosstool.config
index 8cdef715..53ad00c9 100644
--- a/samples/powerpc-e300c3-linux-gnu/crosstool.config
+++ b/samples/powerpc-e300c3-linux-gnu/crosstool.config
@@ -1,7 +1,7 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
CT_ARCH_CPU="e300c3"
CT_TARGET_VENDOR="e300c3"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
# CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
CT_CC_LANG_CXX=y
diff --git a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
index d05e2b42..aab2632e 100644
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@@ -1,16 +1,15 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
CT_ARCH_CPU="8548"
+CT_ARCH_powerpc_ABI_SPE=y
CT_ARCH_FLOAT_SW=y
CT_TARGET_CFLAGS="-mfloat-gprs=double -Wa,-me500x2"
-CT_ARCH_powerpc_ABI_SPE=y
CT_TARGET_VENDOR="e500v2"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_EXTRA_CONFIG_ARRAY="--enable-spe=yes --enable-e500x2 --with-e500x2"
-CT_CC_GCC_SHOW_LINARO=y
CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-e500_double"
CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-e500_double"
# CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
CT_CC_GCC_LDBL_128=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/powerpc-unknown-linux-gnu/crosstool.config b/samples/powerpc-unknown-linux-gnu/crosstool.config
index 8fbfb0bc..29bedbfa 100644
--- a/samples/powerpc-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown-linux-gnu/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_powerpc=y
-CT_KERNEL_linux=y
+CT_ARCH_POWERPC=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=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 5225b61d..749e26dd 100644
--- a/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config
@@ -1,7 +1,7 @@
-CT_ARCH_m68k=y
+CT_ARCH_M68K=y
CT_CANADIAN=y
CT_HOST="powerpc-unknown-linux-uclibc"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_THREADS_LT=y
# CT_LIBICONV is not set
# CT_GETTEXT is not set
diff --git a/samples/powerpc-unknown-linux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc/crosstool.config
index 5dddeeb2..e0f6dcbb 100644
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@@ -1,12 +1,11 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_FOR_TARGET=y
-CT_LIBC_uClibc=y
-CT_LIBC_UCLIBC_WCHAR=y
+CT_LIBC_UCLIBC=y
CT_CC_LANG_CXX=y
CT_CC_LANG_FORTRAN=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
index 4b0dc057..b42fa3b3 100644
--- a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="unknown_nofpu"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
-CT_DEBUG_strace=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
+CT_DEBUG_STRACE=y
diff --git a/samples/powerpc64-multilib-linux-gnu/crosstool.config b/samples/powerpc64-multilib-linux-gnu/crosstool.config
index d59aa5a4..d89a262c 100644
--- a/samples/powerpc64-multilib-linux-gnu/crosstool.config
+++ b/samples/powerpc64-multilib-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
CT_MULTILIB=y
CT_ARCH_64=y
CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
diff --git a/samples/powerpc64-unknown-linux-gnu/crosstool.config b/samples/powerpc64-unknown-linux-gnu/crosstool.config
index 15cb99bf..bbe8d5bb 100644
--- a/samples/powerpc64-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config
@@ -1,8 +1,8 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
CT_ARCH_64=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
diff --git a/samples/powerpc64le-unknown-linux-gnu/crosstool.config b/samples/powerpc64le-unknown-linux-gnu/crosstool.config
index 9f8245e3..21b9e8c2 100644
--- a/samples/powerpc64le-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64le-unknown-linux-gnu/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
CT_ARCH_LE=y
CT_ARCH_64=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
diff --git a/samples/s390-ibm-linux-gnu/crosstool.config b/samples/s390-ibm-linux-gnu/crosstool.config
index 23129340..8648aa57 100644
--- a/samples/s390-ibm-linux-gnu/crosstool.config
+++ b/samples/s390-ibm-linux-gnu/crosstool.config
@@ -1,5 +1,5 @@
CT_EXPERIMENTAL=y
-CT_ARCH_s390=y
-CT_KERNEL_linux=y
+CT_ARCH_S390=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
diff --git a/samples/s390x-ibm-linux-gnu/crosstool.config b/samples/s390x-ibm-linux-gnu/crosstool.config
index 97afa2e3..32f06c0d 100644
--- a/samples/s390x-ibm-linux-gnu/crosstool.config
+++ b/samples/s390x-ibm-linux-gnu/crosstool.config
@@ -1,5 +1,5 @@
-CT_ARCH_s390=y
+CT_ARCH_S390=y
CT_ARCH_64=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
diff --git a/samples/sh-multilib-linux-gnu/crosstool.config b/samples/sh-multilib-linux-gnu/crosstool.config
new file mode 100644
index 00000000..9fe6e416
--- /dev/null
+++ b/samples/sh-multilib-linux-gnu/crosstool.config
@@ -0,0 +1,10 @@
+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_CC_GCC_MULTILIB_LIST="m4-nofpu,m4a,m3"
+CT_CC_LANG_CXX=y
+CT_DEBUG_GDB=y
+# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/sh4-multilib-linux-gnu/reported.by b/samples/sh-multilib-linux-gnu/reported.by
index f03f2c56..f03f2c56 100644
--- a/samples/sh4-multilib-linux-gnu/reported.by
+++ b/samples/sh-multilib-linux-gnu/reported.by
diff --git a/samples/sh-multilib-linux-uclibc/crosstool.config b/samples/sh-multilib-linux-uclibc/crosstool.config
new file mode 100644
index 00000000..66caf04f
--- /dev/null
+++ b/samples/sh-multilib-linux-uclibc/crosstool.config
@@ -0,0 +1,11 @@
+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_CC_GCC_MULTILIB_LIST="sh3,sh4,sh4a,sh4a-nofpu"
+CT_CC_LANG_CXX=y
+CT_DEBUG_GDB=y
+# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/sh4-multilib-linux-uclibc/reported.by b/samples/sh-multilib-linux-uclibc/reported.by
index 2d3a6295..2d3a6295 100644
--- a/samples/sh4-multilib-linux-uclibc/reported.by
+++ b/samples/sh-multilib-linux-uclibc/reported.by
diff --git a/samples/sh-unknown-elf/crosstool.config b/samples/sh-unknown-elf/crosstool.config
new file mode 100644
index 00000000..9387a51a
--- /dev/null
+++ b/samples/sh-unknown-elf/crosstool.config
@@ -0,0 +1,5 @@
+CT_ARCH_SH=y
+CT_ARCH_LE_BE=y
+CT_BINUTILS_PLUGINS=y
+CT_CC_LANG_CXX=y
+CT_GETTEXT=y
diff --git a/samples/sh-unknown-elf/reported.by b/samples/sh-unknown-elf/reported.by
new file mode 100644
index 00000000..04354794
--- /dev/null
+++ b/samples/sh-unknown-elf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Alexey Neyman"
+reporter_url=""
+reporter_comment="Sample SuperH/baremetal configuration with all default multilibs."
diff --git a/samples/sh4-multilib-linux-gnu/crosstool.config b/samples/sh4-multilib-linux-gnu/crosstool.config
deleted file mode 100644
index 2055126e..00000000
--- a/samples/sh4-multilib-linux-gnu/crosstool.config
+++ /dev/null
@@ -1,9 +0,0 @@
-CT_ARCH_sh=y
-CT_ARCH_SH_SH4=y
-CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
-CT_BINUTILS_PLUGINS=y
-CT_CC_GCC_MULTILIB_LIST="m4a"
-CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
-# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/sh4-multilib-linux-uclibc/crosstool.config b/samples/sh4-multilib-linux-uclibc/crosstool.config
deleted file mode 100644
index 2c616432..00000000
--- a/samples/sh4-multilib-linux-uclibc/crosstool.config
+++ /dev/null
@@ -1,11 +0,0 @@
-CT_ARCH_sh=y
-CT_ARCH_SH_SH4=y
-CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
-CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
-CT_CC_GCC_V_4_9_4=y
-CT_CC_GCC_MULTILIB_LIST="m4a,m3"
-CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
-# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/sh4-unknown-linux-gnu/crosstool.config b/samples/sh4-unknown-linux-gnu/crosstool.config
deleted file mode 100644
index 0972f317..00000000
--- a/samples/sh4-unknown-linux-gnu/crosstool.config
+++ /dev/null
@@ -1,7 +0,0 @@
-CT_ARCH_sh=y
-CT_ARCH_SH_SH4=y
-CT_KERNEL_linux=y
-CT_BINUTILS_PLUGINS=y
-CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
-# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/sh4-unknown-linux-gnu/reported.by b/samples/sh4-unknown-linux-gnu/reported.by
deleted file mode 100644
index 4e2eae77..00000000
--- a/samples/sh4-unknown-linux-gnu/reported.by
+++ /dev/null
@@ -1,3 +0,0 @@
-reporter_name="YEM"
-reporter_url="http://ymorin.is-a-geek.org/"
-reporter_comment="EXPERIMENTAL Super-H sh4 sample."
diff --git a/samples/sparc-leon-linux-uclibc/crosstool.config b/samples/sparc-leon-linux-uclibc/crosstool.config
index 02c346db..20612d8c 100644
--- a/samples/sparc-leon-linux-uclibc/crosstool.config
+++ b/samples/sparc-leon-linux-uclibc/crosstool.config
@@ -1,15 +1,14 @@
-CT_ARCH_sparc=y
+CT_ARCH_SPARC=y
CT_ARCH_CPU="leon"
CT_ARCH_TUNE="leon"
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="leon"
-CT_KERNEL_linux=y
-CT_KERNEL_V_3_10=y
-CT_LIBC_uClibc=y
-CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/uClibc.config"
+CT_KERNEL_LINUX=y
+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_LIBC_UCLIBC_WCHAR=y
-CT_CC_GCC_V_6_3_0=y
+CT_GCC_V_6_4_0=y
CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libitm"
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/sparc-unknown-linux-gnu/crosstool.config b/samples/sparc-unknown-linux-gnu/crosstool.config
index 95900375..2b225c72 100644
--- a/samples/sparc-unknown-linux-gnu/crosstool.config
+++ b/samples/sparc-unknown-linux-gnu/crosstool.config
@@ -1,2 +1,2 @@
-CT_ARCH_sparc=y
-CT_KERNEL_linux=y
+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 3cd2a305..7ee711f9 100644
--- a/samples/sparc64-multilib-linux-gnu/crosstool.config
+++ b/samples/sparc64-multilib-linux-gnu/crosstool.config
@@ -1,5 +1,5 @@
-CT_ARCH_sparc=y
+CT_ARCH_SPARC=y
CT_MULTILIB=y
CT_ARCH_64=y
CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
diff --git a/samples/x86_64-centos6-linux-gnu/crosstool.config b/samples/x86_64-centos6-linux-gnu/crosstool.config
index ad84a6c0..6f0c10ff 100644
--- a/samples/x86_64-centos6-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos6-linux-gnu/crosstool.config
@@ -1,10 +1,9 @@
CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_64=y
CT_TARGET_VENDOR="centos6"
-CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_32=y
-CT_LIBC_glibc=y
+CT_KERNEL_LINUX=y
+CT_LINUX_V_2_6_32=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_12_2=y
+CT_GLIBC_V_2_12_2=y
CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-centos7-linux-gnu/crosstool.config b/samples/x86_64-centos7-linux-gnu/crosstool.config
index 8ca023c1..9d16c9e1 100644
--- a/samples/x86_64-centos7-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos7-linux-gnu/crosstool.config
@@ -1,10 +1,9 @@
CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_64=y
CT_TARGET_VENDOR="centos7"
-CT_KERNEL_linux=y
-CT_KERNEL_V_3_10=y
-CT_LIBC_glibc=y
+CT_KERNEL_LINUX=y
+CT_LINUX_V_3_10=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_17=y
+CT_GLIBC_V_2_17=y
CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-multilib-linux-gnu/crosstool.config b/samples/x86_64-multilib-linux-gnu/crosstool.config
index d3e5b637..5fc177c4 100644
--- a/samples/x86_64-multilib-linux-gnu/crosstool.config
+++ b/samples/x86_64-multilib-linux-gnu/crosstool.config
@@ -1,15 +1,14 @@
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_MULTILIB=y
CT_ARCH_64=y
CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y
+CT_GLIBC_KERNEL_VERSION_NONE=y
CT_CC_GCC_MULTILIB_LIST="m64,m32,mx32"
CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/x86_64-multilib-linux-musl/crosstool.config b/samples/x86_64-multilib-linux-musl/crosstool.config
index 7725879b..a24f96f5 100644
--- a/samples/x86_64-multilib-linux-musl/crosstool.config
+++ b/samples/x86_64-multilib-linux-musl/crosstool.config
@@ -1,15 +1,15 @@
CT_EXPERIMENTAL=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_MULTILIB=y
CT_ARCH_64=y
CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_musl=y
+CT_LIBC_MUSL=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=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 a243ac44..d5be28f5 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,11 +1,10 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
CT_TARGET_VENDOR=""
CT_CANADIAN=y
CT_HOST="x86_64-multilib-linux-uclibc"
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
-# CT_GDB_CROSS_PYTHON is not set
+CT_DEBUG_GDB=y
CT_COMP_TOOLS_FOR_HOST=y
-CT_COMP_TOOLS_m4=y
-CT_COMP_TOOLS_make=y
+CT_COMP_TOOLS_M4=y
+CT_COMP_TOOLS_MAKE=y
diff --git a/samples/x86_64-multilib-linux-uclibc/crosstool.config b/samples/x86_64-multilib-linux-uclibc/crosstool.config
index c2fa7fa0..4e08f7cd 100644
--- a/samples/x86_64-multilib-linux-uclibc/crosstool.config
+++ b/samples/x86_64-multilib-linux-uclibc/crosstool.config
@@ -1,16 +1,15 @@
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_MULTILIB=y
CT_ARCH_64=y
CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
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_WCHAR=y
+CT_LIBC_UCLIBC=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
CT_GDB_NATIVE=y
diff --git a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
index 3e2bc3fe..f71ad6da 100644
--- a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
@@ -1,10 +1,9 @@
CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_64=y
CT_TARGET_VENDOR="ubuntu12.04"
-CT_KERNEL_linux=y
-CT_KERNEL_V_3_2=y
-CT_LIBC_glibc=y
+CT_KERNEL_LINUX=y
+CT_LINUX_V_3_2=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_15=y
+CT_GLIBC_V_2_15=y
CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
index 4aa16c7c..e7bfcd3d 100644
--- a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
@@ -1,10 +1,9 @@
CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_64=y
CT_TARGET_VENDOR="ubuntu14.04"
-CT_KERNEL_linux=y
-CT_KERNEL_V_3_13=y
-CT_LIBC_glibc=y
+CT_KERNEL_LINUX=y
+CT_LINUX_V_3_13=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_19=y
+CT_GLIBC_V_2_19=y
CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
index 37be3856..2a7fc1d2 100644
--- a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
@@ -1,10 +1,9 @@
CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_64=y
CT_TARGET_VENDOR="ubuntu16.04"
-CT_KERNEL_linux=y
-CT_KERNEL_V_4_4=y
-CT_LIBC_glibc=y
+CT_KERNEL_LINUX=y
+CT_LINUX_V_4_4=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_23=y
+CT_GLIBC_V_2_23=y
CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-unknown-linux-gnu/crosstool.config b/samples/x86_64-unknown-linux-gnu/crosstool.config
index 3f7c338e..c3518a17 100644
--- a/samples/x86_64-unknown-linux-gnu/crosstool.config
+++ b/samples/x86_64-unknown-linux-gnu/crosstool.config
@@ -1,12 +1,11 @@
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_64=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y
+CT_GLIBC_KERNEL_VERSION_NONE=y
CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/x86_64-unknown-linux-uclibc/crosstool.config b/samples/x86_64-unknown-linux-uclibc/crosstool.config
index 1cf57fb0..6b2eb170 100644
--- a/samples/x86_64-unknown-linux-uclibc/crosstool.config
+++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config
@@ -1,14 +1,13 @@
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_64=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
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_WCHAR=y
+CT_LIBC_UCLIBC=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
CT_GDB_NATIVE=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 34d1ea1c..2fc67d97 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,5 +1,5 @@
CT_EXPERIMENTAL=y
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a9"
CT_ARCH_FPU="neon"
CT_ARCH_FLOAT_HW=y
@@ -7,18 +7,16 @@ CT_TARGET_VENDOR="cortexa9_neon"
CT_CANADIAN=y
CT_HOST="x86_64-w64-mingw32"
CT_TOOLCHAIN_ENABLE_NLS=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
-CT_LIBC_glibc=y
-CT_LIBC_ADDONS_LIST="libidn"
-CT_LIBC_LOCALES=y
-CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y
-CT_CC_GCC_SHOW_LINARO=y
+CT_LIBC_GLIBC=y
+CT_GLIBC_USE_LIBIDN_ADDON=y
+CT_GLIBC_LOCALES=y
+CT_GLIBC_KERNEL_VERSION_NONE=y
# CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
-# CT_GDB_CROSS_PYTHON is not set
+CT_DEBUG_GDB=y
CT_GDB_NATIVE=y
CT_GDB_NATIVE_STATIC=y
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 efd43a0a..f10a91ac 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,18 +1,18 @@
CT_EXPERIMENTAL=y
# CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES is not set
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_ARCH_64=y
CT_TARGET_VENDOR="pc"
CT_CANADIAN=y
CT_HOST="x86_64-w64-mingw32"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_FOR_TARGET=y
-CT_LIBC_glibc=y
+CT_LIBC_GLIBC=y
CT_CC_LANG_CXX=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
-CT_COMP_TOOLS_libtool=y
-CT_COMP_TOOLS_make=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
+CT_COMP_TOOLS_LIBTOOL=y
+CT_COMP_TOOLS_MAKE=y
diff --git a/samples/x86_64-w64-mingw32/crosstool.config b/samples/x86_64-w64-mingw32/crosstool.config
index 253cb1c9..eda9c67b 100644
--- a/samples/x86_64-w64-mingw32/crosstool.config
+++ b/samples/x86_64-w64-mingw32/crosstool.config
@@ -1,9 +1,9 @@
CT_EXPERIMENTAL=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
CT_MULTILIB=y
CT_ARCH_64=y
CT_TARGET_VENDOR="w64"
-CT_KERNEL_windows=y
+CT_KERNEL_WINDOWS=y
CT_BINUTILS_PLUGINS=y
CT_MINGW_DIRECTX=y
CT_MINGW_DDK=y
diff --git a/samples/xtensa-fsf-linux-uclibc/crosstool.config b/samples/xtensa-fsf-linux-uclibc/crosstool.config
index ab82294a..92f03889 100644
--- a/samples/xtensa-fsf-linux-uclibc/crosstool.config
+++ b/samples/xtensa-fsf-linux-uclibc/crosstool.config
@@ -1,9 +1,8 @@
-CT_ARCH_xtensa=y
+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_WCHAR=y
+CT_KERNEL_LINUX=y
+CT_LIBC_UCLIBC=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y