diff --git a/linux-armv5-musl/crosstool-ng.config b/linux-armv5-musl/crosstool-ng.config
index 853c615..c0e655f 100755
--- a/linux-armv5-musl/crosstool-ng.config
+++ b/linux-armv5-musl/crosstool-ng.config
@@ -502,7 +502,8 @@ CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
 CT_CC_GCC_LIBGOMP=y
 # CT_CC_GCC_LIBSSP is not set
 CT_CC_GCC_LIBQUADMATH=y
-CT_CC_GCC_LIBSANITIZER=y
+# Disable ANITIZER: GCC 8.x bug : https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85663
+#  CT_CC_GCC_LIBSANITIZER is not set
 
 #
 # Misc. obscure options.
diff --git a/linux-armv6/Dockerfile.in b/linux-armv6/Dockerfile.in
index 0698644..32c0523 100644
--- a/linux-armv6/Dockerfile.in
+++ b/linux-armv6/Dockerfile.in
@@ -12,8 +12,8 @@ RUN apt-get update \
 && apt-get clean --yes
 
 
-# The CROSS_TRIPLE is a configured alias of the "arm-unknown-linux-gnueabi" target.
-ENV CROSS_TRIPLE arm-unknown-linux-gnueabi
+# The CROSS_TRIPLE is a configured alias of the "armv6-unknown-linux-gnueabi" target.
+ENV CROSS_TRIPLE armv6-unknown-linux-gnueabi
 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
diff --git a/linux-armv6/Toolchain.cmake b/linux-armv6/Toolchain.cmake
index 023f57a..0318d8f 100644
--- a/linux-armv6/Toolchain.cmake
+++ b/linux-armv6/Toolchain.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-set(cross_triple "armv-unknown-linux-gnueabi")
+set(cross_triple "armv6-unknown-linux-gnueabi")
 set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
diff --git a/linux-armv8-rpi4/Dockerfile.in b/linux-armv8-rpi4/Dockerfile.in
index f352d0c..171e556 100644
--- a/linux-armv8-rpi4/Dockerfile.in
+++ b/linux-armv8-rpi4/Dockerfile.in
@@ -11,8 +11,8 @@ RUN apt-get update \
   qemu-user-static \
 && apt-get clean --yes
 
-# The CROSS_TRIPLE is a configured alias of the "aarch64-unknown-linux-gnueabi" target.
-ENV CROSS_TRIPLE aarch64-unknown-linux-gnueabi
+# The CROSS_TRIPLE is a configured alias of the "aarch64-rpi4-linux-gnueabi" target.
+ENV CROSS_TRIPLE aarch64-rpi4-linux-gnueabi
 
 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
diff --git a/linux-armv8-rpi4/Toolchain.cmake b/linux-armv8-rpi4/Toolchain.cmake
index 2b08a67..8c045b7 100644
--- a/linux-armv8-rpi4/Toolchain.cmake
+++ b/linux-armv8-rpi4/Toolchain.cmake
@@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 
-set(cross_triple "aarch64-unknown-linux-gnueabi")
+set(cross_triple "aarch64-rpi4-linux-gnueabi")
 set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
diff --git a/linux-armv8-rpi4/crosstool-ng.config b/linux-armv8-rpi4/crosstool-ng.config
index e10a63d..0fcabb1 100644
--- a/linux-armv8-rpi4/crosstool-ng.config
+++ b/linux-armv8-rpi4/crosstool-ng.config
@@ -148,7 +148,7 @@ CT_ARCH_ARM_MODE_ARM=y
 CT_ARCH_ARM_EABI_FORCE=y
 CT_ARCH_ARM_EABI=y
 CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC RISCV S390 SH SPARC X86 XTENSA"
-CT_ARCH_SUFFIX="v8"
+CT_ARCH_SUFFIX=""
 # CT_OMIT_TARGET_VENDOR is not set
 
 #
@@ -183,9 +183,9 @@ CT_ARCH_SUPPORTS_WITH_TUNE=y
 #  CT_ARCH_SUPPORTS_SOFTFP is not set
 CT_ARCH_EXCLUSIVE_WITH_CPU=y
 CT_ARCH_ARCH=""
-CT_ARCH_FPU="neon-vfpv4"
+CT_ARCH_FPU=""
 # CT_ARCH_FLOAT_AUTO is not set
-CT_ARCH_FLOAT_HW=y
+# CT_ARCH_FLOAT_HW is not set
 # CT_ARCH_FLOAT_SOFTFP is not set
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
diff --git a/linux-mips/crosstool-ng.config b/linux-mips/crosstool-ng.config
index e1650e8..f6b020c 100644
--- a/linux-mips/crosstool-ng.config
+++ b/linux-mips/crosstool-ng.config
@@ -525,7 +525,8 @@ CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
 CT_CC_GCC_LIBGOMP=y
 # CT_CC_GCC_LIBSSP is not set
 CT_CC_GCC_LIBQUADMATH=y
-CT_CC_GCC_LIBSANITIZER=y
+# Disable ANITIZER: GCC 8.x bug : https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85663
+# CT_CC_GCC_LIBSANITIZER is not set
 
 #
 # Misc. obscure options.
diff --git a/linux-mips64/crosstool-ng.config b/linux-mips64/crosstool-ng.config
index 219e57e..779adb6 100644
--- a/linux-mips64/crosstool-ng.config
+++ b/linux-mips64/crosstool-ng.config
@@ -528,7 +528,8 @@ CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
 CT_CC_GCC_LIBGOMP=y
 # CT_CC_GCC_LIBSSP is not set
 CT_CC_GCC_LIBQUADMATH=y
-CT_CC_GCC_LIBSANITIZER=y
+# Disable ANITIZER: GCC 8.x bug : https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85663
+# CT_CC_GCC_LIBSANITIZER is not set
 
 #
 # Misc. obscure options.
diff --git a/linux-s390x/crosstool-ng.config b/linux-s390x/crosstool-ng.config
index 9f0f13f..ce92256 100644
--- a/linux-s390x/crosstool-ng.config
+++ b/linux-s390x/crosstool-ng.config
@@ -127,7 +127,7 @@ CT_ARCH="s390"
 # CT_ARCH_MIPS is not set
 # CT_ARCH_NIOS2 is not set
 # CT_ARCH_POWERPC is not set
-CT_ARCH_s390=y
+CT_ARCH_S390=y
 # CT_ARCH_SH is not set
 # CT_ARCH_SPARC is not set
 # CT_ARCH_X86 is not set
@@ -150,37 +150,20 @@ CT_ARCH_SUFFIX=""
 # CT_MULTILIB is not set
 CT_DEMULTILIB=y
 CT_ARCH_USE_MMU=y
-CT_ARCH_SUPPORTS_EITHER_ENDIAN=y
-CT_ARCH_DEFAULT_BE=y
-CT_ARCH_BE=y
-# CT_ARCH_LE is not set
-CT_ARCH_ENDIAN="big"
 CT_ARCH_SUPPORTS_32=y
 CT_ARCH_SUPPORTS_64=y
 CT_ARCH_DEFAULT_32=y
-CT_ARCH_BITNESS=32
-CT_ARCH_32=y
-# CT_ARCH_64 is not set
+CT_ARCH_BITNESS=64
+CT_ARCH_64=y
+# CT_ARCH_32 is not set
 
 #
 # Target optimisations
 #
-CT_ARCH_SUPPORTS_WITH_ARCH=y
-CT_ARCH_SUPPORTS_WITH_CPU=y
-CT_ARCH_SUPPORTS_WITH_TUNE=y
-# CT_ARCH_SUPPORTS_WITH_FLOAT is not set
-# CT_ARCH_SUPPORTS_WITH_FPU is not set
-# CT_ARCH_SUPPORTS_SOFTFP is not set
-# CT_ARCH_EXCLUSIVE_WITH_CPU is not set
-CT_ARCH_ARCH=""
+CT_ARCH_SUPPORTS_WITH_FPU=y
 CT_ARCH_FPU=""
-# CT_ARCH_FLOAT_AUTO is not set
-# CT_ARCH_FLOAT_HW is not set
-# CT_ARCH_FLOAT_SOFTFP is not set
-# CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-CT_ARCH_FLOAT="hard"
 
 #
 # Toolchain options