summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
Diffstat (limited to 'samples')
-rw-r--r--samples/aarch64-ol7u9-linux-gnu/crosstool.config17
-rw-r--r--samples/aarch64-ol7u9-linux-gnu/reported.by3
-rw-r--r--samples/aarch64-rpi3-linux-gnu/crosstool.config (renamed from samples/aarch64-rpi3-linux-gnueabi/crosstool.config)7
-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-rpi4-linux-gnu/crosstool.config12
-rw-r--r--samples/aarch64-rpi4-linux-gnu/reported.by3
-rw-r--r--samples/aarch64-unknown-linux-android/crosstool.config11
-rw-r--r--samples/aarch64-unknown-linux-android/reported.by3
-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)12
-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.config4
-rw-r--r--samples/alphaev67-unknown-linux-gnu/crosstool.config4
-rw-r--r--samples/arc-arc700-linux-uclibc/crosstool.config8
-rw-r--r--samples/arc-arc700-linux-uclibc/reported.by3
-rw-r--r--samples/arc-archs-linux-gnu/crosstool.config6
-rw-r--r--samples/arc-archs-linux-gnu/reported.by3
-rw-r--r--samples/arc-multilib-elf32/crosstool.config5
-rw-r--r--samples/arc-multilib-elf32/reported.by3
-rw-r--r--samples/arc-multilib-linux-gnu/crosstool.config7
-rw-r--r--samples/arc-multilib-linux-gnu/reported.by3
-rw-r--r--samples/arc-multilib-linux-uclibc/crosstool.config8
-rw-r--r--samples/arc-multilib-linux-uclibc/reported.by3
-rw-r--r--samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config7
-rw-r--r--samples/arm-cortex_a15-linux-gnueabihf/crosstool.config13
-rw-r--r--samples/arm-cortex_a8-linux-gnueabi/crosstool.config14
-rw-r--r--samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config16
-rw-r--r--samples/arm-cortexa5-linux-uclibcgnueabihf/reported.by2
-rw-r--r--samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config15
-rw-r--r--samples/arm-multilib-linux-uclibcgnueabi/crosstool.config14
-rw-r--r--samples/arm-nano-eabi/crosstool.config8
-rw-r--r--samples/arm-ol7u9-linux-gnueabi/crosstool.config17
-rw-r--r--samples/arm-ol7u9-linux-gnueabi/reported.by3
-rw-r--r--samples/arm-ol7u9-linux-gnueabihf/crosstool.config17
-rw-r--r--samples/arm-ol7u9-linux-gnueabihf/reported.by3
-rw-r--r--samples/arm-picolibc-eabi/crosstool.config11
-rw-r--r--samples/arm-picolibc-eabi/reported.by3
-rw-r--r--samples/arm-unknown-eabi/crosstool.config6
-rw-r--r--samples/arm-unknown-linux-gnueabi/crosstool.config13
-rw-r--r--samples/arm-unknown-linux-musleabi/crosstool.config13
-rw-r--r--samples/arm-unknown-linux-uclibcgnueabi/crosstool.config16
-rw-r--r--samples/arm-unknown-linux-uclibcgnueabi/reported.by2
-rw-r--r--samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config15
-rw-r--r--samples/armeb-unknown-eabi/crosstool.config7
-rw-r--r--samples/armeb-unknown-linux-gnueabi/crosstool.config15
-rw-r--r--samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config13
-rw-r--r--samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config8
-rw-r--r--samples/armv6-unknown-linux-gnueabi/crosstool.config (renamed from samples/armv6-rpi-linux-gnueabi/crosstool.config)18
-rw-r--r--samples/armv6-unknown-linux-gnueabi/reported.by (renamed from samples/armv6-rpi-linux-gnueabi/reported.by)2
-rw-r--r--samples/armv6-unknown-linux-gnueabihf/crosstool.config20
-rw-r--r--samples/armv6-unknown-linux-gnueabihf/reported.by3
-rw-r--r--samples/armv7-rpi2-linux-gnueabihf/crosstool.config9
-rw-r--r--samples/armv8-rpi3-linux-gnueabihf/crosstool.config9
-rw-r--r--samples/armv8-rpi4-linux-gnueabihf/crosstool.config14
-rw-r--r--samples/armv8-rpi4-linux-gnueabihf/reported.by3
-rw-r--r--samples/avr/crosstool.config5
-rw-r--r--samples/i586-geode-linux-uclibc/crosstool.config14
-rw-r--r--samples/i686-centos6-linux-gnu/crosstool.config7
-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-ubuntu12.04-linux-gnu/reported.by3
-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.config7
-rw-r--r--samples/i686-w64-mingw32/crosstool.config5
-rw-r--r--samples/m68k-unknown-elf/crosstool.config12
-rw-r--r--samples/m68k-unknown-uclinux-uclibc/crosstool.config5
-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.config7
-rw-r--r--samples/mips-unknown-linux-gnu/crosstool.config13
-rw-r--r--samples/mips-unknown-linux-gnu/reported.by3
-rw-r--r--samples/mips-unknown-linux-uclibc/crosstool.config12
-rw-r--r--samples/mips64-unknown-linux-gnu/crosstool.config7
-rw-r--r--samples/mips64-unknown-linux-gnu/reported.by3
-rw-r--r--samples/mips64el-multilib-linux-uclibc/crosstool.config9
-rw-r--r--samples/mipsel-multilib-linux-gnu/crosstool.config13
-rw-r--r--samples/mipsel-sde-elf/crosstool.config7
-rw-r--r--samples/mipsel-unknown-linux-gnu/crosstool.config13
-rw-r--r--samples/moxie-unknown-elf/crosstool.config7
-rw-r--r--samples/moxie-unknown-elf/reported.by3
-rw-r--r--samples/moxie-unknown-moxiebox/crosstool.config7
-rw-r--r--samples/moxie-unknown-moxiebox/reported.by3
-rw-r--r--samples/msp430-unknown-elf/crosstool.config4
-rw-r--r--samples/msp430-unknown-elf/reported.by3
-rw-r--r--samples/nios2-altera-linux-gnu/crosstool.config8
-rw-r--r--samples/nios2-altera-linux-gnu/reported.by3
-rw-r--r--samples/nios2-unknown-elf/crosstool.config5
-rw-r--r--samples/nios2-unknown-elf/reported.by3
-rw-r--r--samples/powerpc-405-linux-gnu/crosstool.config7
-rw-r--r--samples/powerpc-8540-linux-gnu/crosstool.config16
-rw-r--r--samples/powerpc-8540-linux-gnu/reported.by3
-rw-r--r--samples/powerpc-860-linux-gnu/crosstool.config9
-rw-r--r--samples/powerpc-e300c3-linux-gnu/crosstool.config5
-rw-r--r--samples/powerpc-e500v2-linux-gnuspe/crosstool.config10
-rw-r--r--samples/powerpc-unknown-linux-gnu/crosstool.config11
-rw-r--r--samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config8
-rw-r--r--samples/powerpc-unknown-linux-uclibc/crosstool.config16
-rw-r--r--samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config13
-rw-r--r--samples/powerpc64-multilib-linux-gnu/crosstool.config9
-rw-r--r--samples/powerpc64-unknown-linux-gnu/crosstool.config7
-rw-r--r--samples/powerpc64le-unknown-linux-gnu/crosstool.config7
-rw-r--r--samples/pru/crosstool.config17
-rw-r--r--samples/pru/reported.by3
-rw-r--r--samples/riscv32-hifive1-elf/crosstool.config7
-rw-r--r--samples/riscv32-hifive1-elf/reported.by3
-rw-r--r--samples/riscv32-unknown-elf/crosstool.config6
-rw-r--r--samples/riscv32-unknown-elf/reported.by3
-rw-r--r--samples/riscv64-unknown-elf/crosstool.config8
-rw-r--r--samples/riscv64-unknown-elf/reported.by3
-rw-r--r--samples/riscv64-unknown-linux-gnu/crosstool.config12
-rw-r--r--samples/riscv64-unknown-linux-gnu/reported.by3
-rw-r--r--samples/s390-ibm-linux-gnu/crosstool.config6
-rw-r--r--samples/s390-unknown-linux-gnu/crosstool.config6
-rw-r--r--samples/s390-unknown-linux-gnu/reported.by3
-rw-r--r--samples/s390x-ibm-linux-gnu/crosstool.config6
-rw-r--r--samples/s390x-unknown-linux-gnu/crosstool.config6
-rw-r--r--samples/s390x-unknown-linux-gnu/reported.by3
-rw-r--r--samples/samples.mk89
-rw-r--r--samples/sh-multilib-linux-gnu/crosstool.config11
-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.config12
-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.config10
-rw-r--r--samples/sh4-multilib-linux-uclibc/crosstool.config11
-rw-r--r--samples/sh4-unknown-linux-gnu/crosstool.config8
-rw-r--r--samples/sh4-unknown-linux-gnu/reported.by3
-rw-r--r--samples/sparc-leon-linux-uclibc/crosstool.config16
-rw-r--r--samples/sparc-leon-linux-uclibc/uClibc-ng.config (renamed from samples/sparc-leon-linux-uclibc/uClibc.config)5
-rw-r--r--samples/sparc-unknown-linux-gnu/crosstool.config5
-rw-r--r--samples/sparc64-multilib-linux-gnu/crosstool.config7
-rw-r--r--samples/tic6x-uclinux/crosstool.config12
-rw-r--r--samples/tic6x-uclinux/reported.by3
-rw-r--r--samples/x86_64-centos6-linux-gnu/crosstool.config11
-rw-r--r--samples/x86_64-centos7-linux-gnu/crosstool.config9
-rw-r--r--samples/x86_64-multilib-linux-gnu/crosstool.config11
-rw-r--r--samples/x86_64-multilib-linux-musl/crosstool.config13
-rw-r--r--samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config9
-rw-r--r--samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/reported.by3
-rw-r--r--samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config11
-rw-r--r--samples/x86_64-multilib-linux-uclibc/crosstool.config14
-rw-r--r--samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config9
-rw-r--r--samples/x86_64-ubuntu12.04-linux-gnu/reported.by3
-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.config12
-rw-r--r--samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config19
-rw-r--r--samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config20
-rw-r--r--samples/x86_64-w64-mingw32/crosstool.config9
-rw-r--r--samples/xtensa-fsf-elf/crosstool.config37
-rw-r--r--samples/xtensa-fsf-elf/reported.by4
-rw-r--r--samples/xtensa-fsf-linux-uclibc/crosstool.config10
157 files changed, 905 insertions, 463 deletions
diff --git a/samples/aarch64-ol7u9-linux-gnu/crosstool.config b/samples/aarch64-ol7u9-linux-gnu/crosstool.config
new file mode 100644
index 0000000..d6b538e
--- /dev/null
+++ b/samples/aarch64-ol7u9-linux-gnu/crosstool.config
@@ -0,0 +1,17 @@
+CT_CONFIG_VERSION="4"
+CT_OBSOLETE=y
+CT_ARCH_ARM=y
+CT_ARCH_64=y
+CT_TARGET_VENDOR="ol7u9"
+CT_KERNEL_LINUX=y
+CT_LINUX_USE_ORACLE=y
+CT_BINUTILS_USE_ORACLE=y
+CT_BINUTILS_LINKER_LD_GOLD=y
+CT_BINUTILS_GOLD_THREADS=y
+CT_BINUTILS_LD_WRAPPER=y
+CT_BINUTILS_PLUGINS=y
+CT_GLIBC_USE_ORACLE=y
+CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized"
+CT_GLIBC_ENABLE_COMMON_FLAG=y
+CT_GCC_V_4_9=y
+CT_CC_LANG_CXX=y
diff --git a/samples/aarch64-ol7u9-linux-gnu/reported.by b/samples/aarch64-ol7u9-linux-gnu/reported.by
new file mode 100644
index 0000000..964d9dd
--- /dev/null
+++ b/samples/aarch64-ol7u9-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Jose E. Marchesi"
+reporter_url=""
+reporter_comment="OL 7.9 toolchain configured for AARCH64"
diff --git a/samples/aarch64-rpi3-linux-gnueabi/crosstool.config b/samples/aarch64-rpi3-linux-gnu/crosstool.config
index 798943d..55f4a92 100644
--- a/samples/aarch64-rpi3-linux-gnueabi/crosstool.config
+++ b/samples/aarch64-rpi3-linux-gnu/crosstool.config
@@ -1,11 +1,12 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a53"
CT_ARCH_64=y
-CT_ARCH_arm=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_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 0b99105..a7cdf73 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-rpi4-linux-gnu/crosstool.config b/samples/aarch64-rpi4-linux-gnu/crosstool.config
new file mode 100644
index 0000000..63726a8
--- /dev/null
+++ b/samples/aarch64-rpi4-linux-gnu/crosstool.config
@@ -0,0 +1,12 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
+CT_ARCH_CPU="cortex-a72"
+CT_ARCH_64=y
+CT_TARGET_VENDOR="rpi4"
+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_CC_LANG_CXX=y
+CT_DEBUG_GDB=y
diff --git a/samples/aarch64-rpi4-linux-gnu/reported.by b/samples/aarch64-rpi4-linux-gnu/reported.by
new file mode 100644
index 0000000..0e93b89
--- /dev/null
+++ b/samples/aarch64-rpi4-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Bensuperpc <bensuperpc@gmail.com>"
+reporter_url="https://github.com/Bensuperpc"
+reporter_comment="Raspberry PI 4 aarch64"
diff --git a/samples/aarch64-unknown-linux-android/crosstool.config b/samples/aarch64-unknown-linux-android/crosstool.config
new file mode 100644
index 0000000..51c2490
--- /dev/null
+++ b/samples/aarch64-unknown-linux-android/crosstool.config
@@ -0,0 +1,11 @@
+CT_CONFIG_VERSION="4"
+CT_OBSOLETE=y
+CT_EXPERIMENTAL=y
+CT_ARCH_ARM=y
+CT_ARCH_64=y
+CT_ARCH_ARCH="armv8-a"
+CT_STATIC_TOOLCHAIN=y
+CT_KERNEL_LINUX=y
+CT_ANDROID_API_21=y
+CT_CC_LANG_CXX=y
+CT_DEBUG_GDB=y
diff --git a/samples/aarch64-unknown-linux-android/reported.by b/samples/aarch64-unknown-linux-android/reported.by
new file mode 100644
index 0000000..fb4b9ec
--- /dev/null
+++ b/samples/aarch64-unknown-linux-android/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Howard Chu"
+reporter_url="http://www.symas.com"
+reporter_comment="Config to build cross-compiler for Android/bionic on ARM64"
diff --git a/samples/aarch64-unknown-linux-gnueabi/crosstool.config b/samples/aarch64-unknown-linux-gnu/crosstool.config
index cd0bbd5..df6f415 100644
--- a/samples/aarch64-unknown-linux-gnueabi/crosstool.config
+++ b/samples/aarch64-unknown-linux-gnu/crosstool.config
@@ -1,10 +1,11 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_64=y
-CT_ARCH_arm=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_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 37668de..224868b 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 523ce93..a5bb45a 100644
--- a/samples/aarch64-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/aarch64-unknown-linux-uclibc/crosstool.config
@@ -1,14 +1,14 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_64=y
-CT_ARCH_arm=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_NG=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
-CT_GETTEXT=y
+CT_DEBUG_STRACE=y
diff --git a/samples/aarch64-unknown-linux-uclibcgnueabi/reported.by b/samples/aarch64-unknown-linux-uclibc/reported.by
index d4dfbc2..d4dfbc2 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 67a5807..548190f 100644
--- a/samples/alphaev56-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config
@@ -1,5 +1,5 @@
-CT_ARCH_CPU="ev56"
+CT_CONFIG_VERSION="4"
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 41cc753..5219601 100644
--- a/samples/alphaev67-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev67-unknown-linux-gnu/crosstool.config
@@ -1,6 +1,6 @@
-CT_ARCH_CPU="ev67"
+CT_CONFIG_VERSION="4"
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/arc-arc700-linux-uclibc/crosstool.config b/samples/arc-arc700-linux-uclibc/crosstool.config
new file mode 100644
index 0000000..93305e5
--- /dev/null
+++ b/samples/arc-arc700-linux-uclibc/crosstool.config
@@ -0,0 +1,8 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARC=y
+CT_ARCH_CPU="arc700"
+CT_TARGET_CFLAGS="-mno-atomic"
+CT_TARGET_VENDOR="arc700"
+CT_TARGET_ALIAS="arc-linux"
+CT_KERNEL_LINUX=y
+CT_LIBC_UCLIBC_NG=y
diff --git a/samples/arc-arc700-linux-uclibc/reported.by b/samples/arc-arc700-linux-uclibc/reported.by
new file mode 100644
index 0000000..a493696
--- /dev/null
+++ b/samples/arc-arc700-linux-uclibc/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Alexey Brodkin"
+reporter_url="http://embarc.org"
+reporter_comment="ARCompact uClibc Linux toolchain without atomics"
diff --git a/samples/arc-archs-linux-gnu/crosstool.config b/samples/arc-archs-linux-gnu/crosstool.config
new file mode 100644
index 0000000..dfeb1ed
--- /dev/null
+++ b/samples/arc-archs-linux-gnu/crosstool.config
@@ -0,0 +1,6 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARC=y
+CT_ARCH_CPU="archs"
+CT_TARGET_VENDOR="archs"
+CT_TARGET_ALIAS="arc-linux"
+CT_KERNEL_LINUX=y
diff --git a/samples/arc-archs-linux-gnu/reported.by b/samples/arc-archs-linux-gnu/reported.by
new file mode 100644
index 0000000..a3aad7f
--- /dev/null
+++ b/samples/arc-archs-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Alexey Brodkin"
+reporter_url="http://embarc.org"
+reporter_comment="ARCv2 Glibc Linux toolchain"
diff --git a/samples/arc-multilib-elf32/crosstool.config b/samples/arc-multilib-elf32/crosstool.config
new file mode 100644
index 0000000..e2bce98
--- /dev/null
+++ b/samples/arc-multilib-elf32/crosstool.config
@@ -0,0 +1,5 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARC=y
+CT_MULTILIB=y
+CT_TARGET_VENDOR="multilib"
+CT_TARGET_ALIAS="arc-elf32"
diff --git a/samples/arc-multilib-elf32/reported.by b/samples/arc-multilib-elf32/reported.by
new file mode 100644
index 0000000..4e6b14d
--- /dev/null
+++ b/samples/arc-multilib-elf32/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Alexey Brodkin"
+reporter_url="http://embarc.org"
+reporter_comment="ARC multilib baremetal/elf32 toolchain"
diff --git a/samples/arc-multilib-linux-gnu/crosstool.config b/samples/arc-multilib-linux-gnu/crosstool.config
new file mode 100644
index 0000000..b32c92e
--- /dev/null
+++ b/samples/arc-multilib-linux-gnu/crosstool.config
@@ -0,0 +1,7 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARC=y
+CT_MULTILIB=y
+CT_TARGET_CFLAGS="-matomic"
+CT_TARGET_VENDOR="multilib"
+CT_TARGET_ALIAS="arc-linux"
+CT_KERNEL_LINUX=y
diff --git a/samples/arc-multilib-linux-gnu/reported.by b/samples/arc-multilib-linux-gnu/reported.by
new file mode 100644
index 0000000..e98760a
--- /dev/null
+++ b/samples/arc-multilib-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Alexey Brodkin"
+reporter_url="http://embarc.org"
+reporter_comment="ARC multilib GNU Linux toolchain"
diff --git a/samples/arc-multilib-linux-uclibc/crosstool.config b/samples/arc-multilib-linux-uclibc/crosstool.config
new file mode 100644
index 0000000..16b7569
--- /dev/null
+++ b/samples/arc-multilib-linux-uclibc/crosstool.config
@@ -0,0 +1,8 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARC=y
+CT_MULTILIB=y
+CT_TARGET_CFLAGS="-matomic"
+CT_TARGET_VENDOR="multilib"
+CT_TARGET_ALIAS="arc-linux"
+CT_KERNEL_LINUX=y
+CT_LIBC_UCLIBC_NG=y
diff --git a/samples/arc-multilib-linux-uclibc/reported.by b/samples/arc-multilib-linux-uclibc/reported.by
new file mode 100644
index 0000000..59fc53a
--- /dev/null
+++ b/samples/arc-multilib-linux-uclibc/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Alexey Brodkin"
+reporter_url="http://embarc.org"
+reporter_comment="ARC multilib uClibc Linux toolchain"
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 97a866d..10aceed 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,9 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-m3"
-CT_ARCH_FLOAT_SW=y
-CT_ARCH_arm=y
-# CT_ARCH_USE_MMU is not set
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 b100e84..271fcac 100644
--- a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
@@ -1,18 +1,17 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a15"
CT_ARCH_FPU="neon-vfpv4"
CT_ARCH_FLOAT_HW=y
-CT_ARCH_arm=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_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_GDB_NATIVE_STATIC=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 112e15e..4954c52 100644
--- a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
+++ b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
@@ -1,17 +1,17 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a8"
CT_ARCH_FLOAT_SW=y
-CT_ARCH_arm=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_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_GDB_NATIVE_STATIC=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 fff252e..0fd6f72 100644
--- a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
@@ -1,20 +1,20 @@
+CT_CONFIG_VERSION="4"
CT_EXPERIMENTAL=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a5"
CT_ARCH_FPU="vfpv4-d16"
CT_ARCH_FLOAT_HW=y
-CT_ARCH_arm=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_NG=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-cortexa5-linux-uclibcgnueabihf/reported.by b/samples/arm-cortexa5-linux-uclibcgnueabihf/reported.by
index 57a07cb..7fc2c88 100644
--- a/samples/arm-cortexa5-linux-uclibcgnueabihf/reported.by
+++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/reported.by
@@ -1,3 +1,3 @@
reporter_name="Alexandre Belloni"
-reporter_url="https://plus.google.com/+AlexandreBelloni"
+reporter_url="https://bootlin.com"
reporter_comment="Cortex-A5 using the hard-float GNU EABI (VFPV4-D16 without NEON)."
diff --git a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
index f373f95..4b7a534 100644
--- a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
@@ -1,22 +1,23 @@
+CT_CONFIG_VERSION="4"
CT_EXPERIMENTAL=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a9"
CT_ARCH_FPU="neon"
CT_ARCH_FLOAT_HW=y
-CT_ARCH_arm=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_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 e01942d..4f96263 100644
--- a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
@@ -1,14 +1,16 @@
-CT_ARCH_FLOAT_SW=y
-CT_ARCH_arm=y
+CT_CONFIG_VERSION="4"
+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_NG=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 abb856d..7206007 100644
--- a/samples/arm-nano-eabi/crosstool.config
+++ b/samples/arm-nano-eabi/crosstool.config
@@ -1,9 +1,7 @@
-CT_LOCAL_TARBALLS_DIR="${HOME}/src"
-CT_SAVE_TARBALLS=y
-CT_LOG_EXTRA=y
-CT_ARCH_FLOAT_SW=y
-CT_ARCH_arm=y
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_MULTILIB=y
+CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="nano"
CT_LIBC_NEWLIB_IO_C99FMT=y
CT_LIBC_NEWLIB_IO_LL=y
diff --git a/samples/arm-ol7u9-linux-gnueabi/crosstool.config b/samples/arm-ol7u9-linux-gnueabi/crosstool.config
new file mode 100644
index 0000000..bb12842
--- /dev/null
+++ b/samples/arm-ol7u9-linux-gnueabi/crosstool.config
@@ -0,0 +1,17 @@
+CT_CONFIG_VERSION="4"
+CT_OBSOLETE=y
+CT_ARCH_ARM=y
+CT_ARCH_FLOAT_SW=y
+CT_TARGET_VENDOR="ol7u9"
+CT_KERNEL_LINUX=y
+CT_LINUX_USE_ORACLE=y
+CT_BINUTILS_USE_ORACLE=y
+CT_BINUTILS_LINKER_LD_GOLD=y
+CT_BINUTILS_GOLD_THREADS=y
+CT_BINUTILS_LD_WRAPPER=y
+CT_BINUTILS_PLUGINS=y
+CT_GLIBC_USE_ORACLE=y
+CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized"
+CT_GLIBC_ENABLE_COMMON_FLAG=y
+CT_GCC_V_4_9=y
+CT_CC_LANG_CXX=y
diff --git a/samples/arm-ol7u9-linux-gnueabi/reported.by b/samples/arm-ol7u9-linux-gnueabi/reported.by
new file mode 100644
index 0000000..19080fa
--- /dev/null
+++ b/samples/arm-ol7u9-linux-gnueabi/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Jose E. Marchesi"
+reporter_url=""
+reporter_comment="OL 7.9 toolchain configured for ARM w/o fp hardware"
diff --git a/samples/arm-ol7u9-linux-gnueabihf/crosstool.config b/samples/arm-ol7u9-linux-gnueabihf/crosstool.config
new file mode 100644
index 0000000..1f0c9ab
--- /dev/null
+++ b/samples/arm-ol7u9-linux-gnueabihf/crosstool.config
@@ -0,0 +1,17 @@
+CT_CONFIG_VERSION="4"
+CT_OBSOLETE=y
+CT_ARCH_ARM=y
+CT_ARCH_FLOAT_HW=y
+CT_TARGET_VENDOR="ol7u9"
+CT_KERNEL_LINUX=y
+CT_LINUX_USE_ORACLE=y
+CT_BINUTILS_USE_ORACLE=y
+CT_BINUTILS_LINKER_LD_GOLD=y
+CT_BINUTILS_GOLD_THREADS=y
+CT_BINUTILS_LD_WRAPPER=y
+CT_BINUTILS_PLUGINS=y
+CT_GLIBC_USE_ORACLE=y
+CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized"
+CT_GLIBC_ENABLE_COMMON_FLAG=y
+CT_GCC_V_4_9=y
+CT_CC_LANG_CXX=y
diff --git a/samples/arm-ol7u9-linux-gnueabihf/reported.by b/samples/arm-ol7u9-linux-gnueabihf/reported.by
new file mode 100644
index 0000000..96dee7e
--- /dev/null
+++ b/samples/arm-ol7u9-linux-gnueabihf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Jose E. Marchesi"
+reporter_url=""
+reporter_comment="OL 7.9 toolchain configured for ARM with fp hardware"
diff --git a/samples/arm-picolibc-eabi/crosstool.config b/samples/arm-picolibc-eabi/crosstool.config
new file mode 100644
index 0000000..640f307
--- /dev/null
+++ b/samples/arm-picolibc-eabi/crosstool.config
@@ -0,0 +1,11 @@
+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_MULTILIB_LIST="rmprofile"
+CT_CC_GCC_CONFIG_TLS=y
+CT_CC_LANG_CXX=y
+CT_COMP_LIBS_PICOLIBC=y
diff --git a/samples/arm-picolibc-eabi/reported.by b/samples/arm-picolibc-eabi/reported.by
new file mode 100644
index 0000000..b3bfb49
--- /dev/null
+++ b/samples/arm-picolibc-eabi/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Keith Packard"
+reporter_url="http://keithp.com/"
+reporter_comment="Based on arm-unknown-eabi"
diff --git a/samples/arm-unknown-eabi/crosstool.config b/samples/arm-unknown-eabi/crosstool.config
index 140cc4f..e54f2c9 100644
--- a/samples/arm-unknown-eabi/crosstool.config
+++ b/samples/arm-unknown-eabi/crosstool.config
@@ -1,7 +1,11 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_FLOAT_SW=y
-CT_ARCH_arm=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_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 48cfc4b..b26f33f 100644
--- a/samples/arm-unknown-linux-gnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-gnueabi/crosstool.config
@@ -1,16 +1,17 @@
+CT_CONFIG_VERSION="4"
# CT_REMOVE_DOCS is not set
+CT_ARCH_ARM=y
CT_ARCH_FLOAT_SW=y
-CT_ARCH_arm=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_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 e2335a7..a7adfeb 100644
--- a/samples/arm-unknown-linux-musleabi/crosstool.config
+++ b/samples/arm-unknown-linux-musleabi/crosstool.config
@@ -1,14 +1,15 @@
+CT_CONFIG_VERSION="4"
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 9b8f73a..379c632 100644
--- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,17 +1,17 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_CPU="arm926ej-s"
CT_ARCH_FLOAT_SW=y
-CT_ARCH_arm=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_NG=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/arm-unknown-linux-uclibcgnueabi/reported.by b/samples/arm-unknown-linux-uclibcgnueabi/reported.by
index 01ce94f..9908729 100644
--- a/samples/arm-unknown-linux-uclibcgnueabi/reported.by
+++ b/samples/arm-unknown-linux-uclibcgnueabi/reported.by
@@ -1,3 +1,3 @@
reporter_name="Thomas Petazzoni"
-reporter_url="https://plus.google.com/+ThomasPetazzoni"
+reporter_url="https://bootlin.com"
reporter_comment=""
diff --git a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
index d657934..3f2b5f6 100644
--- a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
@@ -1,18 +1,19 @@
+CT_CONFIG_VERSION="4"
CT_EXPERIMENTAL=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="arm926ej-s"
CT_ARCH_FLOAT_HW=y
-CT_ARCH_arm=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_NG=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 6941150..92fa0a8 100644
--- a/samples/armeb-unknown-eabi/crosstool.config
+++ b/samples/armeb-unknown-eabi/crosstool.config
@@ -1,11 +1,12 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_BE=y
CT_ARCH_FLOAT_SW=y
-CT_ARCH_arm=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 ebb73ba..9a03b80 100644
--- a/samples/armeb-unknown-linux-gnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config
@@ -1,17 +1,18 @@
-CT_ARCH_ARCH="armv5te"
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_BE=y
+CT_ARCH_ARCH="armv5te"
CT_ARCH_FLOAT_SW=y
-CT_ARCH_arm=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_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 2a8f139..9b701f5 100644
--- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,17 +1,18 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_CPU="xscale"
CT_ARCH_BE=y
CT_ARCH_FLOAT_SW=y
-CT_ARCH_arm=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_NG=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 398a550..78e9e98 100644
--- a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
@@ -1,14 +1,12 @@
-CT_ARCH_arm=y
+CT_CONFIG_VERSION="4"
+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_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
-CT_GETTEXT=y
diff --git a/samples/armv6-rpi-linux-gnueabi/crosstool.config b/samples/armv6-unknown-linux-gnueabi/crosstool.config
index 03f2be4..3af9d6b 100644
--- a/samples/armv6-rpi-linux-gnueabi/crosstool.config
+++ b/samples/armv6-unknown-linux-gnueabi/crosstool.config
@@ -1,21 +1,21 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_CPU="arm1176jzf-s"
-CT_ARCH_FPU="vfp"
-CT_ARCH_arm=y
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_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/armv6-rpi-linux-gnueabi/reported.by b/samples/armv6-unknown-linux-gnueabi/reported.by
index c60cdd4..5b0e103 100644
--- a/samples/armv6-rpi-linux-gnueabi/reported.by
+++ b/samples/armv6-unknown-linux-gnueabi/reported.by
@@ -1,3 +1,3 @@
reporter_name="Yann E. MORIN"
reporter_url="http://ymorin.is-a-geek.org/"
-reporter_comment="Toolchain for the Raspberry Pi, with hard-float."
+reporter_comment="Toolchain for the Raspberry Pi, without hard-float."
diff --git a/samples/armv6-unknown-linux-gnueabihf/crosstool.config b/samples/armv6-unknown-linux-gnueabihf/crosstool.config
new file mode 100644
index 0000000..38c6685
--- /dev/null
+++ b/samples/armv6-unknown-linux-gnueabihf/crosstool.config
@@ -0,0 +1,20 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
+CT_ARCH_CPU="arm1176jzf-s"
+CT_ARCH_SUFFIX="v6"
+CT_ARCH_FPU="vfp"
+CT_ARCH_FLOAT_HW=y
+CT_TARGET_VENDOR="rpi"
+CT_KERNEL_LINUX=y
+CT_LINUX_V_5_4=y
+CT_BINUTILS_LINKER_LD_GOLD=y
+CT_BINUTILS_GOLD_THREADS=y
+CT_BINUTILS_LD_WRAPPER=y
+CT_BINUTILS_PLUGINS=y
+CT_GLIBC_LOCALES=y
+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_GDB_CROSS_PYTHON is not set
diff --git a/samples/armv6-unknown-linux-gnueabihf/reported.by b/samples/armv6-unknown-linux-gnueabihf/reported.by
new file mode 100644
index 0000000..853f5c4
--- /dev/null
+++ b/samples/armv6-unknown-linux-gnueabihf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Arnaud Aujon Chevallier"
+reporter_url=""
+reporter_comment="Toolchain for the Raspberry Pi, with hard-float."
diff --git a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
index 9229a0e..d3e1ea3 100644
--- a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
+++ b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
@@ -1,13 +1,14 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a7"
+CT_ARCH_SUFFIX="v7"
CT_ARCH_FPU="neon-vfpv4"
CT_ARCH_FLOAT_HW=y
-CT_ARCH_arm=y
-CT_ARCH_SUFFIX="v7"
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_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 f1ed5fc..22e7b20 100644
--- a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
+++ b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
@@ -1,13 +1,14 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a53"
+CT_ARCH_SUFFIX="v8"
CT_ARCH_FPU="neon-vfpv4"
CT_ARCH_FLOAT_HW=y
-CT_ARCH_arm=y
-CT_ARCH_SUFFIX="v8"
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_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/armv8-rpi4-linux-gnueabihf/crosstool.config b/samples/armv8-rpi4-linux-gnueabihf/crosstool.config
new file mode 100644
index 0000000..5a668ed
--- /dev/null
+++ b/samples/armv8-rpi4-linux-gnueabihf/crosstool.config
@@ -0,0 +1,14 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
+CT_ARCH_CPU="cortex-a72"
+CT_ARCH_SUFFIX="v8"
+CT_ARCH_FPU="neon-vfpv4"
+CT_ARCH_FLOAT_HW=y
+CT_TARGET_VENDOR="rpi4"
+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_CC_LANG_CXX=y
+CT_DEBUG_GDB=y
diff --git a/samples/armv8-rpi4-linux-gnueabihf/reported.by b/samples/armv8-rpi4-linux-gnueabihf/reported.by
new file mode 100644
index 0000000..8a93cbd
--- /dev/null
+++ b/samples/armv8-rpi4-linux-gnueabihf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Bensuperpc <bensuperpc@gmail.com>"
+reporter_url="https://github.com/Bensuperpc"
+reporter_comment="crosstool-NG configuration for Raspberry Pi 4."
diff --git a/samples/avr/crosstool.config b/samples/avr/crosstool.config
index 3a3016f..c119e88 100644
--- a/samples/avr/crosstool.config
+++ b/samples/avr/crosstool.config
@@ -1,3 +1,4 @@
-CT_ARCH_avr=y
+CT_CONFIG_VERSION="4"
+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 540a69e..78c90a3 100644
--- a/samples/i586-geode-linux-uclibc/crosstool.config
+++ b/samples/i586-geode-linux-uclibc/crosstool.config
@@ -1,16 +1,16 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_X86=y
CT_ARCH_ARCH="pentium-mmx"
-CT_ARCH_x86=y
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_NG=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 204f9fb..19448f9 100644
--- a/samples/i686-centos6-linux-gnu/crosstool.config
+++ b/samples/i686-centos6-linux-gnu/crosstool.config
@@ -1,9 +1,8 @@
+CT_CONFIG_VERSION="4"
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_KERNEL_LINUX=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_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 bb9f007..dc95304 100644
--- a/samples/i686-centos7-linux-gnu/crosstool.config
+++ b/samples/i686-centos7-linux-gnu/crosstool.config
@@ -1,9 +1,10 @@
+CT_CONFIG_VERSION="4"
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_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 c1a0676..0a38607 100644
--- a/samples/i686-nptl-linux-gnu/crosstool.config
+++ b/samples/i686-nptl-linux-gnu/crosstool.config
@@ -1,15 +1,16 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_X86=y
CT_ARCH_ARCH="i686"
-CT_ARCH_x86=y
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_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
deleted file mode 100644
index 030c109..0000000
--- a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
+++ /dev/null
@@ -1,9 +0,0 @@
-CT_OBSOLETE=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_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_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 97ae2f8..0000000
--- 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 a67103a..4a5bb92 100644
--- a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
@@ -1,9 +1,10 @@
+CT_CONFIG_VERSION="4"
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_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 3ceac41..ac57a36 100644
--- a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
@@ -1,9 +1,10 @@
+CT_CONFIG_VERSION="4"
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_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 f514937..2e839dd 100644
--- a/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
+++ b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
@@ -1,12 +1,11 @@
+CT_CONFIG_VERSION="4"
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_MPFR_V_3_1_2=y
-CT_MPC_V_1_0_2=y
+CT_DEBUG_GDB=y
diff --git a/samples/i686-w64-mingw32/crosstool.config b/samples/i686-w64-mingw32/crosstool.config
index afa49d0..c731d7b 100644
--- a/samples/i686-w64-mingw32/crosstool.config
+++ b/samples/i686-w64-mingw32/crosstool.config
@@ -1,8 +1,9 @@
+CT_CONFIG_VERSION="4"
CT_EXPERIMENTAL=y
+CT_ARCH_X86=y
CT_ARCH_ARCH="i686"
-CT_ARCH_x86=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/m68k-unknown-elf/crosstool.config b/samples/m68k-unknown-elf/crosstool.config
index b7f64fc9..4413178 100644
--- a/samples/m68k-unknown-elf/crosstool.config
+++ b/samples/m68k-unknown-elf/crosstool.config
@@ -1,10 +1,10 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_M68K=y
CT_ARCH_CPU="cpu32"
-CT_ARCH_m68k=y
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=y
-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 ab0fbe5..c825d37 100644
--- a/samples/m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
@@ -1,3 +1,4 @@
-CT_ARCH_m68k=y
-CT_KERNEL_linux=y
+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 ec2c554..6909c66 100644
--- a/samples/mips-ar2315-linux-gnu/crosstool.config
+++ b/samples/mips-ar2315-linux-gnu/crosstool.config
@@ -1,11 +1,12 @@
-CT_ARCH_ARCH="4kc"
+CT_CONFIG_VERSION="4"
+CT_ARCH_MIPS=y
CT_ARCH_TUNE="4kc"
+CT_ARCH_ARCH="4kc"
CT_ARCH_FLOAT_SW=y
-CT_ARCH_mips=y
CT_TARGET_VENDOR="ar2315"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=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 308a4d8..c5df004 100644
--- a/samples/mips-malta-linux-gnu/crosstool.config
+++ b/samples/mips-malta-linux-gnu/crosstool.config
@@ -1,8 +1,9 @@
-CT_ARCH_mips=y
+CT_CONFIG_VERSION="4"
+CT_ARCH_MIPS=y
CT_TARGET_VENDOR="malta"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=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 49dbadd..7867b9c 100644
--- a/samples/mips-unknown-elf/crosstool.config
+++ b/samples/mips-unknown-elf/crosstool.config
@@ -1,6 +1,7 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_MIPS=y
CT_ARCH_FLOAT_SW=y
-CT_ARCH_mips=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-gnu/crosstool.config b/samples/mips-unknown-linux-gnu/crosstool.config
new file mode 100644
index 0000000..ea78b70
--- /dev/null
+++ b/samples/mips-unknown-linux-gnu/crosstool.config
@@ -0,0 +1,13 @@
+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_CC_GCC_mips_plt=y
+CT_CC_LANG_CXX=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
+# CT_GDB_CROSS_PYTHON is not set
+CT_GDB_NATIVE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/mips-unknown-linux-gnu/reported.by b/samples/mips-unknown-linux-gnu/reported.by
new file mode 100644
index 0000000..41eaaff
--- /dev/null
+++ b/samples/mips-unknown-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Chris Packham"
+reporter_url=""
+reporter_comment="Big-endian configuration for MIPS/glibc."
diff --git a/samples/mips-unknown-linux-uclibc/crosstool.config b/samples/mips-unknown-linux-uclibc/crosstool.config
index 12c45fe..882ceb0 100644
--- a/samples/mips-unknown-linux-uclibc/crosstool.config
+++ b/samples/mips-unknown-linux-uclibc/crosstool.config
@@ -1,12 +1,12 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_MIPS=y
CT_ARCH_ARCH="mips1"
CT_ARCH_FLOAT_SW=y
-CT_ARCH_mips=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_NG=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/mips64-unknown-linux-gnu/crosstool.config b/samples/mips64-unknown-linux-gnu/crosstool.config
new file mode 100644
index 0000000..4b909ce
--- /dev/null
+++ b/samples/mips64-unknown-linux-gnu/crosstool.config
@@ -0,0 +1,7 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_MIPS=y
+CT_ARCH_mips_n64=y
+CT_ARCH_64=y
+CT_ARCH_FLOAT_HW=y
+CT_KERNEL_LINUX=y
+CT_CC_LANG_CXX=y
diff --git a/samples/mips64-unknown-linux-gnu/reported.by b/samples/mips64-unknown-linux-gnu/reported.by
new file mode 100644
index 0000000..41eaaff
--- /dev/null
+++ b/samples/mips64-unknown-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Chris Packham"
+reporter_url=""
+reporter_comment="Big-endian configuration for MIPS/glibc."
diff --git a/samples/mips64el-multilib-linux-uclibc/crosstool.config b/samples/mips64el-multilib-linux-uclibc/crosstool.config
index d5c1865..cf97348 100644
--- a/samples/mips64el-multilib-linux-uclibc/crosstool.config
+++ b/samples/mips64el-multilib-linux-uclibc/crosstool.config
@@ -1,12 +1,13 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_MIPS=y
+CT_MULTILIB=y
CT_ARCH_LE=y
CT_ARCH_64=y
CT_ARCH_FLOAT_SW=y
-CT_ARCH_mips=y
-CT_MULTILIB=y
CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+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 f118fd2..7d54e2a 100644
--- a/samples/mipsel-multilib-linux-gnu/crosstool.config
+++ b/samples/mipsel-multilib-linux-gnu/crosstool.config
@@ -1,16 +1,17 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_MIPS=y
+CT_MULTILIB=y
CT_ARCH_LE=y
CT_ARCH_FLOAT_SW=y
-CT_ARCH_mips=y
-CT_MULTILIB=y
CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=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 81a4f3c..b3ff5af 100644
--- a/samples/mipsel-sde-elf/crosstool.config
+++ b/samples/mipsel-sde-elf/crosstool.config
@@ -1,8 +1,9 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_MIPS=y
CT_ARCH_LE=y
CT_ARCH_FLOAT_SW=y
-CT_ARCH_mips=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 d24c8d1..1008591 100644
--- a/samples/mipsel-unknown-linux-gnu/crosstool.config
+++ b/samples/mipsel-unknown-linux-gnu/crosstool.config
@@ -1,13 +1,14 @@
-CT_ARCH_ARCH="mips1"
+CT_CONFIG_VERSION="4"
+CT_ARCH_MIPS=y
CT_ARCH_LE=y
+CT_ARCH_ARCH="mips1"
CT_ARCH_FLOAT_SW=y
-CT_ARCH_mips=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=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/moxie-unknown-elf/crosstool.config b/samples/moxie-unknown-elf/crosstool.config
new file mode 100644
index 0000000..03d81fc
--- /dev/null
+++ b/samples/moxie-unknown-elf/crosstool.config
@@ -0,0 +1,7 @@
+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
diff --git a/samples/moxie-unknown-elf/reported.by b/samples/moxie-unknown-elf/reported.by
new file mode 100644
index 0000000..13d42a9
--- /dev/null
+++ b/samples/moxie-unknown-elf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Alexey Neyman"
+reporter_url=""
+reporter_comment="Bare metal configuration for moxie architecture."
diff --git a/samples/moxie-unknown-moxiebox/crosstool.config b/samples/moxie-unknown-moxiebox/crosstool.config
new file mode 100644
index 0000000..fe08882
--- /dev/null
+++ b/samples/moxie-unknown-moxiebox/crosstool.config
@@ -0,0 +1,7 @@
+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
diff --git a/samples/moxie-unknown-moxiebox/reported.by b/samples/moxie-unknown-moxiebox/reported.by
new file mode 100644
index 0000000..b9de4f7
--- /dev/null
+++ b/samples/moxie-unknown-moxiebox/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Alexey Neyman"
+reporter_url=""
+reporter_comment="Moxie toolchain with moxiebox+newlib as the C library."
diff --git a/samples/msp430-unknown-elf/crosstool.config b/samples/msp430-unknown-elf/crosstool.config
new file mode 100644
index 0000000..6ca9e31
--- /dev/null
+++ b/samples/msp430-unknown-elf/crosstool.config
@@ -0,0 +1,4 @@
+CT_CONFIG_VERSION="4"
+CT_EXPERIMENTAL=y
+CT_ARCH_MSP430=y
+CT_DEBUG_GDB=y
diff --git a/samples/msp430-unknown-elf/reported.by b/samples/msp430-unknown-elf/reported.by
new file mode 100644
index 0000000..8d39bc4
--- /dev/null
+++ b/samples/msp430-unknown-elf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Andrew Wygle"
+reporter_url="https://github.com/awygle"
+reporter_comment=""
diff --git a/samples/nios2-altera-linux-gnu/crosstool.config b/samples/nios2-altera-linux-gnu/crosstool.config
new file mode 100644
index 0000000..d038aac
--- /dev/null
+++ b/samples/nios2-altera-linux-gnu/crosstool.config
@@ -0,0 +1,8 @@
+CT_CONFIG_VERSION="4"
+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 0000000..52814ae
--- /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 0000000..2fe5d44
--- /dev/null
+++ b/samples/nios2-unknown-elf/crosstool.config
@@ -0,0 +1,5 @@
+CT_CONFIG_VERSION="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 0000000..4347939
--- /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 1df4d50..128570c 100644
--- a/samples/powerpc-405-linux-gnu/crosstool.config
+++ b/samples/powerpc-405-linux-gnu/crosstool.config
@@ -1,9 +1,10 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_POWERPC=y
CT_ARCH_CPU="405"
CT_ARCH_FLOAT_SW=y
-CT_ARCH_powerpc=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-8540-linux-gnu/crosstool.config b/samples/powerpc-8540-linux-gnu/crosstool.config
new file mode 100644
index 0000000..e6a0bf5
--- /dev/null
+++ b/samples/powerpc-8540-linux-gnu/crosstool.config
@@ -0,0 +1,16 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_POWERPC=y
+CT_ARCH_CPU="8540"
+# CT_DEMULTILIB is not set
+CT_ARCH_FLOAT_SW=y
+CT_TARGET_VENDOR="8540"
+CT_KERNEL_LINUX=y
+CT_LINUX_V_3_4=y
+CT_GLIBC_V_2_23=y
+CT_CC_GCC_SYSTEM_ZLIB=y
+CT_CC_GCC_LIBMUDFLAP=y
+CT_CC_GCC_LIBSSP=y
+CT_CC_GCC_LIBQUADMATH=y
+CT_CC_LANG_CXX=y
+CT_CC_LANG_FORTRAN=y
+CT_DEBUG_GDB=y
diff --git a/samples/powerpc-8540-linux-gnu/reported.by b/samples/powerpc-8540-linux-gnu/reported.by
new file mode 100644
index 0000000..f1314bd
--- /dev/null
+++ b/samples/powerpc-8540-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Marcin Orlowski"
+reporter_url="http://marcinorlowski.com/"
+reporter_comment="PowerPC 8540 with soft-float math."
diff --git a/samples/powerpc-860-linux-gnu/crosstool.config b/samples/powerpc-860-linux-gnu/crosstool.config
index d1bb075..d34db5c 100644
--- a/samples/powerpc-860-linux-gnu/crosstool.config
+++ b/samples/powerpc-860-linux-gnu/crosstool.config
@@ -1,10 +1,11 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_POWERPC=y
CT_ARCH_CPU="860"
CT_ARCH_FLOAT_SW=y
-CT_ARCH_powerpc=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 9a0f7d3..131abd0 100644
--- a/samples/powerpc-e300c3-linux-gnu/crosstool.config
+++ b/samples/powerpc-e300c3-linux-gnu/crosstool.config
@@ -1,7 +1,8 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_POWERPC=y
CT_ARCH_CPU="e300c3"
-CT_ARCH_powerpc=y
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 1c3a7e3..ef76f7d 100644
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@@ -1,16 +1,16 @@
+CT_CONFIG_VERSION="4"
+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=y
-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 8fbfb0b..a515447 100644
--- a/samples/powerpc-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown-linux-gnu/crosstool.config
@@ -1,9 +1,10 @@
-CT_ARCH_powerpc=y
-CT_KERNEL_linux=y
+CT_CONFIG_VERSION="4"
+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 5225b61..29e7406 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_CONFIG_VERSION="4"
+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
+CT_GETTEXT_V_0_20_1=y
diff --git a/samples/powerpc-unknown-linux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc/crosstool.config
index 3d2d26d..a463464 100644
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@@ -1,12 +1,12 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_POWERPC=y
CT_ARCH_FLOAT_SW=y
-CT_ARCH_powerpc=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
CT_BINUTILS_FOR_TARGET=y
-CT_LIBC_uClibc=y
-CT_LIBC_UCLIBC_WCHAR=y
-CT_CC_LANG_FORTRAN=y
+CT_LIBC_UCLIBC_NG=y
CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_CC_LANG_FORTRAN=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 12108db..7c0d50b 100644
--- a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
@@ -1,11 +1,10 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_POWERPC=y
CT_ARCH_FLOAT_SW=y
-CT_ARCH_powerpc=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_GDB_V_6_8a=y
-CT_DEBUG_strace=y
-CT_STRACE_V_4_5_19=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 d8b0c8c..2e81f9a 100644
--- a/samples/powerpc64-multilib-linux-gnu/crosstool.config
+++ b/samples/powerpc64-multilib-linux-gnu/crosstool.config
@@ -1,10 +1,11 @@
-CT_ARCH_64=y
-CT_ARCH_powerpc=y
+CT_CONFIG_VERSION="4"
+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 da858b2..9dd482c 100644
--- a/samples/powerpc64-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config
@@ -1,8 +1,9 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_POWERPC=y
CT_ARCH_64=y
-CT_ARCH_powerpc=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 8bea162..11229d3 100644
--- a/samples/powerpc64le-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64le-unknown-linux-gnu/crosstool.config
@@ -1,9 +1,10 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_POWERPC=y
CT_ARCH_LE=y
CT_ARCH_64=y
-CT_ARCH_powerpc=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/pru/crosstool.config b/samples/pru/crosstool.config
new file mode 100644
index 0000000..23d24f4
--- /dev/null
+++ b/samples/pru/crosstool.config
@@ -0,0 +1,17 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_PRU=y
+CT_OMIT_TARGET_VENDOR=y
+# CT_DEMULTILIB is not set
+CT_TARGET_ALIAS_SED_EXPR="s/pru-elf/pru/"
+# CT_LIBC_NEWLIB_FVWRITE_IN_STREAMIO is not set
+# CT_LIBC_NEWLIB_UNBUF_STREAM_OPT is not set
+# CT_LIBC_NEWLIB_FSEEK_OPTIMIZATION is not set
+# CT_LIBC_NEWLIB_ATEXIT_DYNAMIC_ALLOC is not set
+# CT_LIBC_NEWLIB_MULTITHREAD is not set
+CT_LIBC_NEWLIB_EXTRA_SECTIONS=y
+# CT_LIBC_NEWLIB_WIDE_ORIENT is not set
+CT_LIBC_NEWLIB_NANO_MALLOC=y
+CT_LIBC_NEWLIB_NANO_FORMATTED_IO=y
+CT_CC_LANG_CXX=y
+CT_COMP_LIBS_GNUPRUMCU=y
+CT_COMP_TOOLS_MAKE=y
diff --git a/samples/pru/reported.by b/samples/pru/reported.by
new file mode 100644
index 0000000..eafd0c4
--- /dev/null
+++ b/samples/pru/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Dimitar Dimitrov"
+reporter_url="https://github.com/dinuxbg/gnupru"
+reporter_comment="PRU cross toolchain"
diff --git a/samples/riscv32-hifive1-elf/crosstool.config b/samples/riscv32-hifive1-elf/crosstool.config
new file mode 100644
index 0000000..994cb33
--- /dev/null
+++ b/samples/riscv32-hifive1-elf/crosstool.config
@@ -0,0 +1,7 @@
+CT_CONFIG_VERSION="4"
+CT_EXPERIMENTAL=y
+CT_ARCH_RISCV=y
+CT_ARCH_ARCH="rv32ima"
+CT_ARCH_ABI="ilp32"
+CT_TARGET_VENDOR="hifive1"
+# CT_CC_GCC_LDBL_128 is not set
diff --git a/samples/riscv32-hifive1-elf/reported.by b/samples/riscv32-hifive1-elf/reported.by
new file mode 100644
index 0000000..291cc00
--- /dev/null
+++ b/samples/riscv32-hifive1-elf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Franz Flasch"
+reporter_url="https://github.com/franzflasch/crosstool-ng"
+reporter_comment=""
diff --git a/samples/riscv32-unknown-elf/crosstool.config b/samples/riscv32-unknown-elf/crosstool.config
new file mode 100644
index 0000000..96d665b
--- /dev/null
+++ b/samples/riscv32-unknown-elf/crosstool.config
@@ -0,0 +1,6 @@
+CT_CONFIG_VERSION="4"
+CT_EXPERIMENTAL=y
+CT_ARCH_RISCV=y
+CT_TARGET_VENDOR=""
+CT_LIBC_NONE=y
+# CT_CC_GCC_LDBL_128 is not set
diff --git a/samples/riscv32-unknown-elf/reported.by b/samples/riscv32-unknown-elf/reported.by
new file mode 100644
index 0000000..82ccb87
--- /dev/null
+++ b/samples/riscv32-unknown-elf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Antony Pavlov"
+reporter_url="https://github.com/frantony/crosstool-ng"
+reporter_comment=""
diff --git a/samples/riscv64-unknown-elf/crosstool.config b/samples/riscv64-unknown-elf/crosstool.config
new file mode 100644
index 0000000..4ee0357
--- /dev/null
+++ b/samples/riscv64-unknown-elf/crosstool.config
@@ -0,0 +1,8 @@
+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_DEBUG_GDB=y
+# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/riscv64-unknown-elf/reported.by b/samples/riscv64-unknown-elf/reported.by
new file mode 100644
index 0000000..9456e59
--- /dev/null
+++ b/samples/riscv64-unknown-elf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Paul Walmsley <paul.walmsley@sifive.com>"
+reporter_url="https://www.sifive.com/"
+reporter_comment=""
diff --git a/samples/riscv64-unknown-linux-gnu/crosstool.config b/samples/riscv64-unknown-linux-gnu/crosstool.config
new file mode 100644
index 0000000..e145719
--- /dev/null
+++ b/samples/riscv64-unknown-linux-gnu/crosstool.config
@@ -0,0 +1,12 @@
+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_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
diff --git a/samples/riscv64-unknown-linux-gnu/reported.by b/samples/riscv64-unknown-linux-gnu/reported.by
new file mode 100644
index 0000000..9456e59
--- /dev/null
+++ b/samples/riscv64-unknown-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Paul Walmsley <paul.walmsley@sifive.com>"
+reporter_url="https://www.sifive.com/"
+reporter_comment=""
diff --git a/samples/s390-ibm-linux-gnu/crosstool.config b/samples/s390-ibm-linux-gnu/crosstool.config
index 2312934..00c111a 100644
--- a/samples/s390-ibm-linux-gnu/crosstool.config
+++ b/samples/s390-ibm-linux-gnu/crosstool.config
@@ -1,5 +1,7 @@
+CT_CONFIG_VERSION="4"
CT_EXPERIMENTAL=y
-CT_ARCH_s390=y
-CT_KERNEL_linux=y
+CT_ARCH_S390=y
+CT_TARGET_VENDOR="ibm"
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
diff --git a/samples/s390-unknown-linux-gnu/crosstool.config b/samples/s390-unknown-linux-gnu/crosstool.config
new file mode 100644
index 0000000..ccf2334
--- /dev/null
+++ b/samples/s390-unknown-linux-gnu/crosstool.config
@@ -0,0 +1,6 @@
+CT_CONFIG_VERSION="4"
+CT_EXPERIMENTAL=y
+CT_ARCH_S390=y
+CT_KERNEL_LINUX=y
+CT_BINUTILS_PLUGINS=y
+CT_CC_LANG_CXX=y
diff --git a/samples/s390-unknown-linux-gnu/reported.by b/samples/s390-unknown-linux-gnu/reported.by
new file mode 100644
index 0000000..6fb7272
--- /dev/null
+++ b/samples/s390-unknown-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Pradipta Ghosh"
+reporter_url="https://github.com/pradghos/crosstool-ng"
+reporter_comment="reference samples s390-ibm-linux-gnu"
diff --git a/samples/s390x-ibm-linux-gnu/crosstool.config b/samples/s390x-ibm-linux-gnu/crosstool.config
index 7df41c9..788bd1f 100644
--- a/samples/s390x-ibm-linux-gnu/crosstool.config
+++ b/samples/s390x-ibm-linux-gnu/crosstool.config
@@ -1,5 +1,7 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_S390=y
CT_ARCH_64=y
-CT_ARCH_s390=y
-CT_KERNEL_linux=y
+CT_TARGET_VENDOR="ibm"
+CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
diff --git a/samples/s390x-unknown-linux-gnu/crosstool.config b/samples/s390x-unknown-linux-gnu/crosstool.config
new file mode 100644
index 0000000..3298991
--- /dev/null
+++ b/samples/s390x-unknown-linux-gnu/crosstool.config
@@ -0,0 +1,6 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_S390=y
+CT_ARCH_64=y
+CT_KERNEL_LINUX=y
+CT_BINUTILS_PLUGINS=y
+CT_CC_LANG_CXX=y
diff --git a/samples/s390x-unknown-linux-gnu/reported.by b/samples/s390x-unknown-linux-gnu/reported.by
new file mode 100644
index 0000000..7ac1e07
--- /dev/null
+++ b/samples/s390x-unknown-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Pradipta Ghosh"
+reporter_url="https://github.com/pradghos/crosstool-ng"
+reporter_comment="reference samples s390x-ibm-linux-gnu"
diff --git a/samples/samples.mk b/samples/samples.mk
index 5c8f130..51e9619 100644
--- a/samples/samples.mk
+++ b/samples/samples.mk
@@ -19,22 +19,22 @@ CT_UPDATE_SAMPLES := no
# This part deals with the samples help entries
help-config::
+ @echo ' show-config - Show a brief overview of current configuration'
@echo ' saveconfig - Save current config as a preconfigured target'
help-samples::
- @echo ' list-samples - prints the list of all samples (for scripting)'
- @echo ' show-<sample> - show a brief overview of <sample> (list with list-samples)'
- @echo ' <sample> - preconfigure crosstool-NG with <sample> (list with list-samples)'
+ @echo ' list-samples - Prints the list of all samples (for scripting)'
+ @echo ' show-<sample> - Show a brief overview of <sample> (list with list-samples)'
+ @echo ' <sample> - Preconfigure crosstool-NG with <sample> (list with list-samples)'
@echo ' build-all[.#] - Build *all* samples (list with list-samples) and install in'
@echo ' $${CT_PREFIX} (set to ~/x-tools by default)'
help-distrib::
@echo ' check-samples - Verify if samples need updates due to Kconfig changes'
@echo ' update-samples - Regenerate sample configurations using the current Kconfig'
- @echo ' wiki-samples - Print a DokuWiki table of samples'
help-env::
- @echo ' CT_PREFIX=dir - install samples in dir (see action "build-all", above).'
+ @echo ' CT_PREFIX=dir - Install samples in dir (see action "build-all", above).'
# ----------------------------------------------------------
# This part deals with printing samples information
@@ -43,16 +43,17 @@ help-env::
PHONY += show-config
show-config: .config
@cp .config .config.sample
- @$(CT_LIB_DIR)/scripts/showSamples.sh -v current
+ @$(bash) $(CT_LIB_DIR)/scripts/show-config.sh -v current
@rm -f .config.sample
# Prints the details of a sample
PHONY += $(patsubst %,show-%,$(CT_SAMPLES))
-$(patsubst %,show-%,$(CT_SAMPLES)): show-%: config_files
+$(patsubst %,show-%,$(CT_SAMPLES)): show-%:
@KCONFIG_CONFIG=$$(pwd)/.config.sample \
- $(CONF) --defconfig=$(call sample_dir,$*)/crosstool.config \
+ CT_VCHECK=load \
+ $(CONF) --defconfig=$(call sample_dir,$*)/crosstool.config \
$(KCONFIG_TOP) >/dev/null
- @$(CT_LIB_DIR)/scripts/showSamples.sh -v $*
+ @$(bash) $(CT_LIB_DIR)/scripts/show-config.sh -v $*
@rm -f .config.sample
# Prints the details of all samples
@@ -66,17 +67,19 @@ list-samples: list-samples-pre $(patsubst %,list-%,$(CT_SAMPLES))
@echo ' G (Global) : sample was installed with crosstool-NG'
@echo ' X (EXPERIMENTAL): sample may use EXPERIMENTAL features'
@echo ' B (BROKEN) : sample is currently broken'
+ @echo ' O (OBSOLETE) : sample needs to be upgraded'
PHONY += list-samples-pre
list-samples-pre: FORCE
@echo 'Status Sample name'
PHONY += $(patsubst %,list-%,$(CT_SAMPLES))
-$(patsubst %,list-%,$(CT_SAMPLES)): list-%: config_files
+$(patsubst %,list-%,$(CT_SAMPLES)): list-%:
@KCONFIG_CONFIG=$$(pwd)/.config.sample \
+ CT_VCHECK=load \
$(CONF) --defconfig=$(call sample_dir,$*)/crosstool.config \
$(KCONFIG_TOP) >/dev/null
- @$(CT_LIB_DIR)/scripts/showSamples.sh $*
+ @$(bash) $(CT_LIB_DIR)/scripts/show-config.sh $*
@rm -f .config.sample
PHONY += list-samples-short
@@ -85,22 +88,27 @@ list-samples-short: FORCE
printf "%s\n" "$${s}"; \
done
-# Check one sample
+# Check one sample. Note that we are not loading but rather copying the defconfig;
+# loading it while it contains some removed options would reset them to currently
+# supported default values.
PHONY += $(patsubst %,check-%,$(CT_SAMPLES))
-$(patsubst %,check-%,$(CT_SAMPLES)): check-%: config_files
- @export KCONFIG_CONFIG=$$(pwd)/.config.sample; \
+$(patsubst %,check-%,$(CT_SAMPLES)): check-%:
+ @set -e; export KCONFIG_CONFIG=$$(pwd)/.config.sample; \
CT_NG_SAMPLE=$(call sample_dir,$*)/crosstool.config; \
- $(CONF) -s --defconfig=$${CT_NG_SAMPLE} $(KCONFIG_TOP) &>/dev/null; \
- $(CONF) -s --savedefconfig=$$(pwd)/.defconfig $(KCONFIG_TOP) &>/dev/null; \
- old_sha1=$$( sha1sum "$${CT_NG_SAMPLE}" |cut -d ' ' -f 1 ); \
- new_sha1=$$( sha1sum .defconfig |cut -d ' ' -f 1 ); \
- if [ $${old_sha1} != $${new_sha1} ]; then \
- if [ $(CT_UPDATE_SAMPLES) = yes ]; then \
- echo "Updating $*"; \
- mv .defconfig "$${CT_NG_SAMPLE}"; \
+ cp $${CT_NG_SAMPLE} .config.sample; \
+ CT_UPGRADECONFIG=yes \
+ $(bash) $(CT_LIB_DIR)/scripts/version-check.sh .config.sample &>/dev/null; \
+ CT_VCHECK=load $(CONF) -s --olddefconfig \
+ $(KCONFIG_TOP) &>/dev/null; \
+ CT_VCHECK=save $(CONF) -s --savedefconfig=$$(pwd)/.defconfig \
+ $(KCONFIG_TOP) &>/dev/null; \
+ if ! cmp -s "$${CT_NG_SAMPLE}" .defconfig; then \
+ if [ $(CT_UPDATE_SAMPLES) = yes ]; then \
+ echo "Updating $*"; \
+ mv .defconfig "$${CT_NG_SAMPLE}"; \
else \
- echo "$* needs update:"; \
- diff -du0 "$${CT_NG_SAMPLE}" .defconfig |tail -n +4; \
+ echo "$* needs update:"; \
+ diff -d -U 0 "$${CT_NG_SAMPLE}" .defconfig |tail -n +4; \
fi; \
fi
@rm -f .config.sample* .defconfig
@@ -110,22 +118,6 @@ check-samples: $(patsubst %,check-%,$(CT_SAMPLES))
update-samples:
$(SILENT)$(MAKE) -rf $(CT_NG) check-samples CT_UPDATE_SAMPLES=yes
-PHONY += wiki-samples
-wiki-samples: wiki-samples-pre $(patsubst %,wiki-%,$(CT_SAMPLES)) wiki-samples-post
-
-wiki-samples-pre: FORCE
- $(SILENT)$(CT_LIB_DIR)/scripts/showSamples.sh -w
-
-wiki-samples-post: FORCE
- $(SILENT)$(CT_LIB_DIR)/scripts/showSamples.sh -W $(CT_SAMPLES)
-
-$(patsubst %,wiki-%,$(CT_SAMPLES)): wiki-%: config_files
- $(SILENT)KCONFIG_CONFIG=$$(pwd)/.config.sample \
- $(CONF) --defconfig=$(call sample_dir,$*)/crosstool.config \
- $(KCONFIG_TOP) >/dev/null
- $(SILENT)$(CT_LIB_DIR)/scripts/showSamples.sh -w $*
- $(SILENT)rm -f .config.sample
-
# ----------------------------------------------------------
# This part deals with saving/restoring samples
@@ -136,7 +128,7 @@ samples:
# Save a sample
saveconfig: .config samples
- $(SILENT)$(CT_LIB_DIR)/scripts/saveSample.sh
+ $(SILENT)CONF=$(CONF) $(bash) $(CT_LIB_DIR)/scripts/saveSample.sh
# The 'sample_dir' function prints the directory in which the sample is,
# searching first in local samples, then in global samples
@@ -146,9 +138,10 @@ endef
# How we do recall one sample
PHONY += $(CT_SAMPLES)
-$(CT_SAMPLES): config_files
- @$(CT_ECHO) " CONF $(KCONFIG_TOP)"
- $(SILENT)$(CONF) --defconfig=$(call sample_dir,$@)/crosstool.config $(KCONFIG_TOP)
+$(CT_SAMPLES): check-config
+ @$(CT_ECHO) " CONF $@"
+ $(SILENT)CT_VCHECK=load $(CONF) --defconfig=$(call sample_dir,$@)/crosstool.config $(KCONFIG_TOP)
+ @CT_VCHECK=strict $(bash) $(CT_LIB_DIR)/scripts/version-check.sh .config
@echo
@echo '***********************************************************'
@echo
@@ -185,7 +178,7 @@ target_triplet = $(if $(findstring $(__comma),$(1)),$(word 2,$(subst $(__comma),
# $1: sample name (target tuple, or host/target tuples separated by a comma)
define build_sample
@$(CT_ECHO) ' CONF $(1)'
- $(SILENT)$(CONF) -s --defconfig=$(call sample_dir,$(1))/crosstool.config $(KCONFIG_TOP)
+ $(SILENT)CT_VCHECK=load $(CONF) -s --defconfig=$(call sample_dir,$(1))/crosstool.config $(KCONFIG_TOP)
$(SILENT)[ -n "$(CT_PREFIX)" ] && $(sed) -i -r -e 's:^(CT_PREFIX=).*$$:\1"$(CT_PREFIX)":;' .config || :
$(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_(WARN|INFO|EXTRA|DEBUG|ALL)).*$$:# \1 is not set:;' .config
$(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_ERROR).*$$:\1=y:;' .config
@@ -207,9 +200,9 @@ define build_sample
mkdir -p .build-all/$$status/$(1); \
bzip2 < build.log > .build-all/$$status/$(1)/build.log.bz2; \
if [ "$$status" = PASS ]; then \
- blddir=`$(bash) $(CT_LIB_DIR)/scripts/showConfig.sh '$${CT_BUILD_TOP_DIR}'`; \
+ blddir=`$(bash) $(CT_LIB_DIR)/scripts/show-tuple.sh '$${CT_BUILD_TOP_DIR}'`; \
[ -z "$(CT_PRESERVE_PASSED_BUILDS)" ] && rm -rf $${blddir}; \
- $(bash) $(CT_LIB_DIR)/scripts/showConfig.sh '$${CT_PREFIX_DIR}' > .build-all/PASS/$(1)/prefix; \
+ $(bash) $(CT_LIB_DIR)/scripts/show-tuple.sh '$${CT_PREFIX_DIR}' > .build-all/PASS/$(1)/prefix; \
fi; \
:
endef
@@ -225,7 +218,7 @@ endif # MAKECMDGOALS contains a build sample rule
endif # MAKECMDGOALS != ""
# Build a single sample
-$(patsubst %,build-%,$(CT_SAMPLES)): build-%: config_files
+$(patsubst %,build-%,$(CT_SAMPLES)): build-%:
$(call build_sample,$*)
# Cross samples (build==host)
diff --git a/samples/sh-multilib-linux-gnu/crosstool.config b/samples/sh-multilib-linux-gnu/crosstool.config
new file mode 100644
index 0000000..0337ffd
--- /dev/null
+++ b/samples/sh-multilib-linux-gnu/crosstool.config
@@ -0,0 +1,11 @@
+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_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 f03f2c5..f03f2c5 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 0000000..df09c37
--- /dev/null
+++ b/samples/sh-multilib-linux-uclibc/crosstool.config
@@ -0,0 +1,12 @@
+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_NG=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 2d3a629..2d3a629 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 0000000..00213dd
--- /dev/null
+++ b/samples/sh-unknown-elf/crosstool.config
@@ -0,0 +1,5 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_SH=y
+CT_ARCH_LE_BE=y
+CT_BINUTILS_PLUGINS=y
+CT_CC_LANG_CXX=y
diff --git a/samples/sh-unknown-elf/reported.by b/samples/sh-unknown-elf/reported.by
new file mode 100644
index 0000000..0435479
--- /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 e8c40f4..0000000
--- a/samples/sh4-multilib-linux-gnu/crosstool.config
+++ /dev/null
@@ -1,10 +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_V_4_9_4=y
-CT_CC_GCC_MULTILIB_LIST="m4,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 26ad038..0000000
--- 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="m4,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 ba17f06..0000000
--- a/samples/sh4-unknown-linux-gnu/crosstool.config
+++ /dev/null
@@ -1,8 +0,0 @@
-CT_ARCH_sh=y
-CT_ARCH_SH_SH4=y
-CT_KERNEL_linux=y
-CT_BINUTILS_PLUGINS=y
-CT_CC_GCC_V_4_9_4=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 4e2eae7..0000000
--- 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 a29bdeb..0fd6360 100644
--- a/samples/sparc-leon-linux-uclibc/crosstool.config
+++ b/samples/sparc-leon-linux-uclibc/crosstool.config
@@ -1,14 +1,14 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_SPARC=y
CT_ARCH_CPU="leon"
CT_ARCH_TUNE="leon"
CT_ARCH_FLOAT_SW=y
-CT_ARCH_sparc=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_LIBC_UCLIBC_IPV6=y
-CT_LIBC_UCLIBC_WCHAR=y
-CT_CC_GCC_V_4_9_4=y
+CT_KERNEL_LINUX=y
+CT_LINUX_V_3_10=y
+CT_LIBC_UCLIBC_NG=y
+CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}.config"
+CT_GCC_V_6=y
CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libitm"
CT_CC_LANG_CXX=y
+CT_DEBUG_GDB=y
diff --git a/samples/sparc-leon-linux-uclibc/uClibc.config b/samples/sparc-leon-linux-uclibc/uClibc-ng.config
index abcfe40..c81724c 100644
--- a/samples/sparc-leon-linux-uclibc/uClibc.config
+++ b/samples/sparc-leon-linux-uclibc/uClibc-ng.config
@@ -2,6 +2,8 @@ TARGET_sparc=y
# UCLIBC_HAS_FPU is not set
DO_C99_MATH=y
UCLIBC_HAS_THREADS_NATIVE=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
UCLIBC_SUSV3_LEGACY=y
UCLIBC_SUSV4_LEGACY=y
# UNIX98PTY_ONLY is not set
@@ -9,9 +11,6 @@ UCLIBC_HAS_LIBUTIL=y
UCLIBC_HAS_SHA256_CRYPT_IMPL=y
UCLIBC_HAS_SHA512_CRYPT_IMPL=y
UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
UCLIBC_USE_NETLINK=y
UCLIBC_HAS_RESOLVER_SUPPORT=y
UCLIBC_HAS_LIBRESOLV_STUB=y
diff --git a/samples/sparc-unknown-linux-gnu/crosstool.config b/samples/sparc-unknown-linux-gnu/crosstool.config
index 9590037..93ac922 100644
--- a/samples/sparc-unknown-linux-gnu/crosstool.config
+++ b/samples/sparc-unknown-linux-gnu/crosstool.config
@@ -1,2 +1,3 @@
-CT_ARCH_sparc=y
-CT_KERNEL_linux=y
+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 4dae2b4..d758f01 100644
--- a/samples/sparc64-multilib-linux-gnu/crosstool.config
+++ b/samples/sparc64-multilib-linux-gnu/crosstool.config
@@ -1,5 +1,6 @@
-CT_ARCH_64=y
-CT_ARCH_sparc=y
+CT_CONFIG_VERSION="4"
+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/tic6x-uclinux/crosstool.config b/samples/tic6x-uclinux/crosstool.config
new file mode 100644
index 0000000..614c39a
--- /dev/null
+++ b/samples/tic6x-uclinux/crosstool.config
@@ -0,0 +1,12 @@
+CT_CONFIG_VERSION="4"
+CT_EXPERIMENTAL=y
+CT_ARCH_C6X=y
+CT_OMIT_TARGET_VENDOR=y
+CT_MULTILIB=y
+CT_KERNEL_LINUX=y
+CT_ARCH_BINFMT_FDPIC=y
+CT_LIBC_UCLIBC_NG=y
+CT_UCLIBC_NG_SRC_DEVEL=y
+CT_UCLIBC_NG_DEVEL_URL="https://github.com/DspHack/uclibc-ng.git"
+CT_THREADS_LT=y
+CT_CC_LANG_CXX=y
diff --git a/samples/tic6x-uclinux/reported.by b/samples/tic6x-uclinux/reported.by
new file mode 100644
index 0000000..e51f694
--- /dev/null
+++ b/samples/tic6x-uclinux/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Dan Tejada <dan.tejada@cantada.com>"
+reporter_url="https://www.cantada.com/"
+reporter_comment="Tested with uclibc and linux kernel from http://linux-c6x.org"
diff --git a/samples/x86_64-centos6-linux-gnu/crosstool.config b/samples/x86_64-centos6-linux-gnu/crosstool.config
index 4eb4611..e9747cd 100644
--- a/samples/x86_64-centos6-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos6-linux-gnu/crosstool.config
@@ -1,9 +1,12 @@
+CT_CONFIG_VERSION="4"
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_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_1=y
+CT_GLIBC_EXTRA_CFLAGS=""
+# CT_GLIBC_ENABLE_COMMON_FLAG is not set
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 4a441ef..cfe8fa4 100644
--- a/samples/x86_64-centos7-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos7-linux-gnu/crosstool.config
@@ -1,9 +1,10 @@
+CT_CONFIG_VERSION="4"
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_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 f9a16ae..b19920d 100644
--- a/samples/x86_64-multilib-linux-gnu/crosstool.config
+++ b/samples/x86_64-multilib-linux-gnu/crosstool.config
@@ -1,14 +1,15 @@
-CT_ARCH_64=y
-CT_ARCH_x86=y
+CT_CONFIG_VERSION="4"
+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_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 c099136..0fe7cda 100644
--- a/samples/x86_64-multilib-linux-musl/crosstool.config
+++ b/samples/x86_64-multilib-linux-musl/crosstool.config
@@ -1,15 +1,16 @@
+CT_CONFIG_VERSION="4"
CT_EXPERIMENTAL=y
-CT_ARCH_64=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,moxie-unknown-moxiebox/crosstool.config b/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config
new file mode 100644
index 0000000..ed795f3
--- /dev/null
+++ b/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config
@@ -0,0 +1,9 @@
+CT_CONFIG_VERSION="4"
+CT_EXPERIMENTAL=y
+CT_ARCH_MOXIE=y
+CT_CANADIAN=y
+CT_HOST="x86_64-multilib-linux-uclibc"
+CT_DEBUG_GDB=y
+CT_GDB_CROSS_SIM=y
+# CT_LIBICONV_NEEDED is not set
+# CT_GETTEXT_NEEDED is not set
diff --git a/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/reported.by b/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/reported.by
new file mode 100644
index 0000000..e396a70
--- /dev/null
+++ b/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Alexey Neyman"
+reporter_url=""
+reporter_comment="Canadian cross using moxiebox lib."
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 a243ac4..867ac13 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,12 @@
-CT_ARCH_powerpc=y
+CT_CONFIG_VERSION="4"
+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_GETTEXT_V_0_20_1=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 3642b95..50c5d3b 100644
--- a/samples/x86_64-multilib-linux-uclibc/crosstool.config
+++ b/samples/x86_64-multilib-linux-uclibc/crosstool.config
@@ -1,16 +1,16 @@
-CT_ARCH_64=y
-CT_ARCH_x86=y
+CT_CONFIG_VERSION="4"
+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_NG=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
deleted file mode 100644
index c09ab9d..0000000
--- a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
+++ /dev/null
@@ -1,9 +0,0 @@
-CT_OBSOLETE=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_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_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 d060e03..0000000
--- 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 68b3102..15380f0 100644
--- a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
@@ -1,9 +1,10 @@
+CT_CONFIG_VERSION="4"
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_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 fc10edb..b30e6d1 100644
--- a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
@@ -1,9 +1,10 @@
+CT_CONFIG_VERSION="4"
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_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 7f16ffd..ec8f38f 100644
--- a/samples/x86_64-unknown-linux-gnu/crosstool.config
+++ b/samples/x86_64-unknown-linux-gnu/crosstool.config
@@ -1,11 +1,12 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_X86=y
CT_ARCH_64=y
-CT_ARCH_x86=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_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 3ddc085..9edc8d3 100644
--- a/samples/x86_64-unknown-linux-uclibc/crosstool.config
+++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config
@@ -1,14 +1,14 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_X86=y
CT_ARCH_64=y
-CT_ARCH_x86=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_NG=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 b99c349..b93a99b 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,26 +1,23 @@
+CT_CONFIG_VERSION="4"
CT_EXPERIMENTAL=y
-CT_LOCAL_TARBALLS_DIR="${HOME}/src"
-CT_SAVE_TARBALLS=y
-CT_LOG_EXTRA=y
+CT_ARCH_ARM=y
CT_ARCH_CPU="cortex-a9"
CT_ARCH_FPU="neon"
CT_ARCH_FLOAT_HW=y
-CT_ARCH_arm=y
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_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 42a37c3..cf53af7 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,23 +1,19 @@
+CT_CONFIG_VERSION="4"
CT_EXPERIMENTAL=y
# CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES is not set
+CT_ARCH_X86=y
CT_ARCH_64=y
-CT_ARCH_x86=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_CC_LANG_CXX=y
-CT_DEBUG_ltrace=y
-CT_LTRACE_V_0_5_3=y
-CT_DEBUG_strace=y
-CT_STRACE_V_4_5_19=y
-CT_GMP_V_5_1_3=y
-CT_MPFR_V_3_1_2=y
-CT_MPC_V_0_9=y
-CT_COMP_TOOLS=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 58a6b48..470be44 100644
--- a/samples/x86_64-w64-mingw32/crosstool.config
+++ b/samples/x86_64-w64-mingw32/crosstool.config
@@ -1,12 +1,13 @@
+CT_CONFIG_VERSION="4"
CT_EXPERIMENTAL=y
+CT_ARCH_X86=y
+CT_MULTILIB=y
CT_ARCH_64=y
-CT_ARCH_x86=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
-CT_MINGW_TOOLS=y
CT_THREADS_POSIX=y
-CT_CC_LANG_FORTRAN=y
CT_CC_LANG_CXX=y
+CT_CC_LANG_FORTRAN=y
diff --git a/samples/xtensa-fsf-elf/crosstool.config b/samples/xtensa-fsf-elf/crosstool.config
new file mode 100644
index 0000000..a13c477
--- /dev/null
+++ b/samples/xtensa-fsf-elf/crosstool.config
@@ -0,0 +1,37 @@
+CT_CONFIG_VERSION="4"
+CT_OBSOLETE=y
+CT_EXPERIMENTAL=y
+CT_ALLOW_BUILD_AS_ROOT=y
+CT_ALLOW_BUILD_AS_ROOT_SURE=y
+CT_ARCH_XTENSA=y
+CT_MULTILIB=y
+CT_TARGET_CFLAGS="-mlongcalls"
+CT_TARGET_VENDOR="fsf"
+CT_BINUTILS_SRC_DEVEL=y
+CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
+CT_BINUTILS_DEVEL_REVISION="0104f7d3"
+CT_BINUTILS_V_2_30=y
+CT_NEWLIB_SRC_DEVEL=y
+CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git"
+CT_NEWLIB_DEVEL_REVISION="fdbb7b81"
+CT_LIBC_NEWLIB_TARGET_CFLAGS="-DSIGNAL_PROVIDED -DABORT_PROVIDED -DMALLOC_PROVIDED"
+CT_LIBC_NEWLIB_DISABLE_SUPPLIED_SYSCALLS=y
+CT_GCC_SRC_DEVEL=y
+CT_GCC_DEVEL_VCS_git=y
+CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git"
+CT_GCC_DEVEL_REVISION="bae67e9e"
+CT_CC_GCC_ENABLE_CXX_FLAGS="-fno-rtti -ffunction-sections"
+CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-threads=posix"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libstdcxx-verbose --enable-threads=posix --enable-gcov-custom-rtio"
+# CT_CC_GCC_STATIC_LIBSTDCXX is not set
+# CT_CC_CXA_ATEXIT is not set
+# CT_CC_GCC_LDBL_128 is not set
+CT_CC_LANG_CXX=y
+CT_DEBUG_GDB=y
+CT_GDB_SRC_DEVEL=y
+CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
+CT_GDB_DEVEL_REVISION="a9ff2591"
+CT_GDB_V_8_1=y
+CT_ISL_V_0_19=y
+CT_COMP_TOOLS_AUTOCONF=y
+CT_COMP_TOOLS_AUTOMAKE=y
diff --git a/samples/xtensa-fsf-elf/reported.by b/samples/xtensa-fsf-elf/reported.by
new file mode 100644
index 0000000..a51872d
--- /dev/null
+++ b/samples/xtensa-fsf-elf/reported.by
@@ -0,0 +1,4 @@
+reporter_name="Anton Maklakov"
+reporter_url=""
+reporter_comment="Modified from the configuration reported in #985 to not include
+overlays."
diff --git a/samples/xtensa-fsf-linux-uclibc/crosstool.config b/samples/xtensa-fsf-linux-uclibc/crosstool.config
index 92b7276..0e821cb 100644
--- a/samples/xtensa-fsf-linux-uclibc/crosstool.config
+++ b/samples/xtensa-fsf-linux-uclibc/crosstool.config
@@ -1,9 +1,9 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_XTENSA=y
CT_ARCH_BE=y
CT_TARGET_CFLAGS="-mlongcalls -mtext-section-literals"
-CT_ARCH_xtensa=y
CT_TARGET_VENDOR="fsf"
-CT_KERNEL_linux=y
-CT_LIBC_uClibc=y
-CT_LIBC_UCLIBC_WCHAR=y
+CT_KERNEL_LINUX=y
+CT_LIBC_UCLIBC_NG=y
CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y