Run the samples through `ct-ng update-samples`

- Pin sparc-leon-linux-gnu to GCC6, again. - Remove "brokenness" explanation from moxie-elf comment (was only applicable to stage-2 compiler, not final). Signed-off-by: Alexey Neyman <stilor@att.net>
4 years ago · 93dd61e257
94 changed files with 100 additions and 22 deletions
--- a/samples/aarch64-rpi3-linux-gnu/crosstool.config
+++ b/samples/aarch64-rpi3-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a53"
 CT_ARCH_64=y
--- a/samples/aarch64-unknown-linux-android/crosstool.config
+++ b/samples/aarch64-unknown-linux-android/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_64=y
@ -7,4 +8,3 @@ CT_KERNEL_LINUX=y
 CT_ANDROID_API_21=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
-CT_GETTEXT=y
--- a/samples/aarch64-unknown-linux-gnu/crosstool.config
+++ b/samples/aarch64-unknown-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR=""
--- a/samples/aarch64-unknown-linux-uclibc/crosstool.config
+++ b/samples/aarch64-unknown-linux-uclibc/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR=""
@ -11,4 +12,3 @@ CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
 CT_GDB_NATIVE=y
 CT_DEBUG_STRACE=y
-CT_GETTEXT=y
--- a/samples/alphaev56-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ALPHA_EV56=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
--- a/samples/alphaev67-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev67-unknown-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ALPHA_EV67=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
--- a/samples/arc-arc700-linux-uclibc/crosstool.config
+++ b/samples/arc-arc700-linux-uclibc/crosstool.config
@ -1,7 +1,8 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARC=y
-CT_TARGET_ALIAS="arc-linux"
+CT_ARCH_CPU="arc700"
 CT_TARGET_CFLAGS="-mno-atomic"
 CT_TARGET_VENDOR="snps"
+CT_TARGET_ALIAS="arc-linux"
 CT_KERNEL_LINUX=y
 CT_LIBC_UCLIBC=y
-CT_ARCH_CPU="arc700"
--- a/samples/arc-multilib-elf32/crosstool.config
+++ b/samples/arc-multilib-elf32/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARC=y
 CT_MULTILIB=y
 CT_TARGET_VENDOR="multilib"
--- a/samples/arc-multilib-linux-uclibc/crosstool.config
+++ b/samples/arc-multilib-linux-uclibc/crosstool.config
@ -1,7 +1,8 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARC=y
-CT_TARGET_ALIAS="arc-linux"
+CT_MULTILIB=y
 CT_TARGET_CFLAGS="-matomic"
 CT_TARGET_VENDOR="multilib"
+CT_TARGET_ALIAS="arc-linux"
 CT_KERNEL_LINUX=y
 CT_LIBC_UCLIBC=y
-CT_MULTILIB=y
--- a/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
+++ b/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-m3"
 CT_ARCH_ARM_MODE_THUMB=y
--- a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a15"
 CT_ARCH_FPU="neon-vfpv4"
--- a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
+++ b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a8"
 CT_ARCH_FLOAT_SW=y
--- a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a5"
--- a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a9"
--- a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_MULTILIB=y
 CT_ARCH_FLOAT_SW=y
--- a/samples/arm-nano-eabi/crosstool.config
+++ b/samples/arm-nano-eabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_MULTILIB=y
 CT_ARCH_FLOAT_SW=y
--- a/samples/arm-unknown-eabi/crosstool.config
+++ b/samples/arm-unknown-eabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_FLOAT_SW=y
 CT_LIBC_NEWLIB_IO_C99FMT=y
--- a/samples/arm-unknown-linux-gnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-gnueabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 # CT_REMOVE_DOCS is not set
 CT_ARCH_ARM=y
 CT_ARCH_FLOAT_SW=y
--- a/samples/arm-unknown-linux-musleabi/crosstool.config
+++ b/samples/arm-unknown-linux-musleabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_KERNEL_LINUX=y
--- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="arm926ej-s"
 CT_ARCH_FLOAT_SW=y
--- a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_CPU="arm926ej-s"
--- a/samples/armeb-unknown-eabi/crosstool.config
+++ b/samples/armeb-unknown-eabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_BE=y
 CT_ARCH_FLOAT_SW=y
--- a/samples/armeb-unknown-linux-gnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_BE=y
 CT_ARCH_ARCH="armv5te"
--- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="xscale"
 CT_ARCH_BE=y
--- a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_SUFFIX="v6"
 # CT_ARCH_USE_MMU is not set
@ -10,4 +11,3 @@ CT_THREADS_NONE=y
 CT_CC_GCC_DISABLE_PCH=y
 CT_CC_GCC_BUILD_ID=y
 CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
-CT_GETTEXT=y
--- a/samples/armv6-rpi-linux-gnueabi/crosstool.config
+++ b/samples/armv6-rpi-linux-gnueabi/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="arm1176jzf-s"
 CT_ARCH_SUFFIX="v6"
--- a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
+++ b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a7"
 CT_ARCH_SUFFIX="v7"
--- a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
+++ b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a53"
 CT_ARCH_SUFFIX="v8"
--- a/samples/avr/crosstool.config
+++ b/samples/avr/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_AVR=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
--- a/samples/i586-geode-linux-uclibc/crosstool.config
+++ b/samples/i586-geode-linux-uclibc/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_X86=y
 CT_ARCH_ARCH="pentium-mmx"
 CT_TARGET_VENDOR="geode"
--- a/samples/i686-centos6-linux-gnu/crosstool.config
+++ b/samples/i686-centos6-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
--- a/samples/i686-centos7-linux-gnu/crosstool.config
+++ b/samples/i686-centos7-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
--- a/samples/i686-nptl-linux-gnu/crosstool.config
+++ b/samples/i686-nptl-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="nptl"
--- a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
--- a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
--- a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
--- a/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
+++ b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 # CT_REMOVE_DOCS is not set
 CT_ARCH_NIOS2=y
--- a/samples/i686-w64-mingw32/crosstool.config
+++ b/samples/i686-w64-mingw32/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
--- a/samples/m68k-unknown-elf/crosstool.config
+++ b/samples/m68k-unknown-elf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_M68K=y
 CT_ARCH_CPU="cpu32"
 CT_ARCH_BINFMT_FLAT=y
--- a/samples/m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_M68K=y
 CT_KERNEL_LINUX=y
 CT_THREADS_LT=y
--- a/samples/mips-ar2315-linux-gnu/crosstool.config
+++ b/samples/mips-ar2315-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_ARCH_TUNE="4kc"
 CT_ARCH_ARCH="4kc"
--- a/samples/mips-malta-linux-gnu/crosstool.config
+++ b/samples/mips-malta-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_TARGET_VENDOR="malta"
 CT_KERNEL_LINUX=y
--- a/samples/mips-unknown-elf/crosstool.config
+++ b/samples/mips-unknown-elf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_ARCH_FLOAT_SW=y
 CT_LIBC_NONE=y
--- a/samples/mips-unknown-linux-uclibc/crosstool.config
+++ b/samples/mips-unknown-linux-uclibc/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_ARCH_ARCH="mips1"
 CT_ARCH_FLOAT_SW=y
--- a/samples/mips64el-multilib-linux-uclibc/crosstool.config
+++ b/samples/mips64el-multilib-linux-uclibc/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_MULTILIB=y
 CT_ARCH_LE=y
--- a/samples/mipsel-multilib-linux-gnu/crosstool.config
+++ b/samples/mipsel-multilib-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_MULTILIB=y
 CT_ARCH_LE=y
--- a/samples/mipsel-sde-elf/crosstool.config
+++ b/samples/mipsel-sde-elf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_ARCH_LE=y
 CT_ARCH_FLOAT_SW=y
--- a/samples/mipsel-unknown-linux-gnu/crosstool.config
+++ b/samples/mipsel-unknown-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_MIPS=y
 CT_ARCH_LE=y
 CT_ARCH_ARCH="mips1"
--- a/samples/moxie-unknown-elf/crosstool.config
+++ b/samples/moxie-unknown-elf/crosstool.config
@ -1,6 +1,6 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_MOXIE=y
-CT_LIBC_NEWLIB=y
 CT_DEBUG_GDB=y
 CT_GDB_CROSS_SIM=y
 # CT_GDB_CROSS_PYTHON is not set
--- a/samples/moxie-unknown-elf/reported.by
+++ b/samples/moxie-unknown-elf/reported.by
@ -1,10 +1,3 @@
 reporter_name="Alexey Neyman"
 reporter_url=""
-reporter_comment="Bare metal configuration for moxie architecture.
-
-It appears to generate a broken toolchain. E.g. newlib's CRT expects
-symbols __bss_start__ and __bss_end__, while linker script generates
-__bss_start (no underscores at the end) and no __bss_end__whatsoever.
-
-This is not a bug in crosstool-NG. If you're interested in saving the
-moxie, please report this upstream."
+reporter_comment="Bare metal configuration for moxie architecture."
--- a/samples/moxiebox/crosstool.config
+++ b/samples/moxiebox/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_MOXIE=y
 CT_ARCH_LE=y
--- a/samples/msp430-unknown-elf/crosstool.config
+++ b/samples/msp430-unknown-elf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_MSP430=y
 CT_DEBUG_GDB=y
--- a/samples/nios2-altera-linux-gnu/crosstool.config
+++ b/samples/nios2-altera-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_NIOS2=y
 CT_ARCH_USE_MMU=y
 CT_TARGET_VENDOR="altera"
--- a/samples/nios2-unknown-elf/crosstool.config
+++ b/samples/nios2-unknown-elf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_NIOS2=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
--- a/samples/powerpc-405-linux-gnu/crosstool.config
+++ b/samples/powerpc-405-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_CPU="405"
 CT_ARCH_FLOAT_SW=y
--- a/samples/powerpc-8540-linux-gnu/crosstool.config
+++ b/samples/powerpc-8540-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_CPU="8540"
 # CT_DEMULTILIB is not set
--- a/samples/powerpc-860-linux-gnu/crosstool.config
+++ b/samples/powerpc-860-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_CPU="860"
 CT_ARCH_FLOAT_SW=y
--- a/samples/powerpc-e300c3-linux-gnu/crosstool.config
+++ b/samples/powerpc-e300c3-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_CPU="e300c3"
 CT_TARGET_VENDOR="e300c3"
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_CPU="8548"
 CT_ARCH_powerpc_ABI_SPE=y
--- a/samples/powerpc-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
--- 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,6 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_M68K=y
 CT_CANADIAN=y
 CT_HOST="powerpc-unknown-linux-uclibc"
 CT_KERNEL_LINUX=y
 CT_THREADS_LT=y
-# CT_LIBICONV is not set
-# CT_GETTEXT is not set
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_FLOAT_SW=y
 CT_KERNEL_LINUX=y
--- a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="unknown_nofpu"
--- a/samples/powerpc64-multilib-linux-gnu/crosstool.config
+++ b/samples/powerpc64-multilib-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_MULTILIB=y
 CT_ARCH_64=y
--- a/samples/powerpc64-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_64=y
 CT_KERNEL_LINUX=y
--- a/samples/powerpc64le-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64le-unknown-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_ARCH_LE=y
 CT_ARCH_64=y
--- a/samples/riscv32-hifive1-elf/crosstool.config
+++ b/samples/riscv32-hifive1-elf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_RISCV=y
 CT_ARCH_ARCH="rv32ima"
--- a/samples/riscv32-unknown-elf/crosstool.config
+++ b/samples/riscv32-unknown-elf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_RISCV=y
 CT_TARGET_VENDOR=""
--- a/samples/riscv64-unknown-elf/crosstool.config
+++ b/samples/riscv64-unknown-elf/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_RISCV=y
 # CT_DEMULTILIB is not set
--- a/samples/riscv64-unknown-linux-gnu/crosstool.config
+++ b/samples/riscv64-unknown-linux-gnu/crosstool.config
@ -1,12 +1,12 @@
+CT_CONFIG_VERSION="1"
 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_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 # CT_GDB_GDBSERVER is not set
 CT_ZLIB_NEEDED=y
-CT_TARGET_VENDOR="unknown"
-CT_ARCH_ARCH="rv64gc"
--- a/samples/s390-ibm-linux-gnu/crosstool.config
+++ b/samples/s390-ibm-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_S390=y
 CT_KERNEL_LINUX=y
--- a/samples/s390x-ibm-linux-gnu/crosstool.config
+++ b/samples/s390x-ibm-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_S390=y
 CT_ARCH_64=y
 CT_KERNEL_LINUX=y
--- a/samples/sh-multilib-linux-gnu/crosstool.config
+++ b/samples/sh-multilib-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_SH=y
 CT_ARCH_CPU="sh4"
 CT_ARCH_LE_BE=y
--- a/samples/sh-multilib-linux-uclibc/crosstool.config
+++ b/samples/sh-multilib-linux-uclibc/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_SH=y
 CT_ARCH_CPU="sh4"
 CT_ARCH_LE_BE=y
--- a/samples/sh-unknown-elf/crosstool.config
+++ b/samples/sh-unknown-elf/crosstool.config
@ -1,5 +1,5 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_SH=y
 CT_ARCH_LE_BE=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
-CT_GETTEXT=y
--- a/samples/sparc-leon-linux-uclibc/crosstool.config
+++ b/samples/sparc-leon-linux-uclibc/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_SPARC=y
 CT_ARCH_CPU="leon"
 CT_ARCH_TUNE="leon"
@ -8,7 +9,7 @@ CT_LINUX_V_3_10=y
 CT_LIBC_UCLIBC=y
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}.config"
 CT_LIBC_UCLIBC_IPV6=y
-CT_GCC_V_6_4_0=y
+CT_GCC_V_6_5_0=y
 CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libitm"
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
--- a/samples/sparc-unknown-linux-gnu/crosstool.config
+++ b/samples/sparc-unknown-linux-gnu/crosstool.config
@ -1,2 +1,3 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_SPARC=y
 CT_KERNEL_LINUX=y
--- a/samples/sparc64-multilib-linux-gnu/crosstool.config
+++ b/samples/sparc64-multilib-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_SPARC=y
 CT_MULTILIB=y
 CT_ARCH_64=y
--- a/samples/x86_64-centos6-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos6-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_64=y
--- a/samples/x86_64-centos7-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos7-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_64=y
--- a/samples/x86_64-multilib-linux-gnu/crosstool.config
+++ b/samples/x86_64-multilib-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_X86=y
 CT_MULTILIB=y
 CT_ARCH_64=y
--- a/samples/x86_64-multilib-linux-musl/crosstool.config
+++ b/samples/x86_64-multilib-linux-musl/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_X86=y
 CT_MULTILIB=y
--- a/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config
+++ b/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_MOXIE=y
 CT_CANADIAN=y
--- 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,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_POWERPC=y
 CT_TARGET_VENDOR=""
 CT_CANADIAN=y
--- a/samples/x86_64-multilib-linux-uclibc/crosstool.config
+++ b/samples/x86_64-multilib-linux-uclibc/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_X86=y
 CT_MULTILIB=y
 CT_ARCH_64=y
--- a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_64=y
--- a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_64=y
--- a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_OBSOLETE=y
 CT_ARCH_X86=y
 CT_ARCH_64=y
--- a/samples/x86_64-unknown-linux-gnu/crosstool.config
+++ b/samples/x86_64-unknown-linux-gnu/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_X86=y
 CT_ARCH_64=y
 CT_KERNEL_LINUX=y
--- a/samples/x86_64-unknown-linux-uclibc/crosstool.config
+++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_X86=y
 CT_ARCH_64=y
 CT_KERNEL_LINUX=y
--- 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,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a9"
--- 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,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 # CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES is not set
 CT_ARCH_X86=y
--- a/samples/x86_64-w64-mingw32/crosstool.config
+++ b/samples/x86_64-w64-mingw32/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_EXPERIMENTAL=y
 CT_ARCH_X86=y
 CT_MULTILIB=y
--- a/samples/xtensa-fsf-linux-uclibc/crosstool.config
+++ b/samples/xtensa-fsf-linux-uclibc/crosstool.config
@ -1,3 +1,4 @@
+CT_CONFIG_VERSION="1"
 CT_ARCH_XTENSA=y
 CT_ARCH_BE=y
 CT_TARGET_CFLAGS="-mlongcalls -mtext-section-literals"