diff --git a/linux-armv5-musl/crosstool-ng.config b/linux-armv5-musl/crosstool-ng.config
index a89d069..e317af0 100755
--- a/linux-armv5-musl/crosstool-ng.config
+++ b/linux-armv5-musl/crosstool-ng.config
@@ -680,7 +680,7 @@ CT_GDB_7_0_or_later=y
 CT_GDB_CROSS=y
 # CT_GDB_CROSS_STATIC is not set
 # CT_GDB_CROSS_SIM is not set
-CT_GDB_CROSS_PYTHON=y
+# CT_GDB_CROSS_PYTHON is not set
 CT_GDB_CROSS_PYTHON_BINARY=""
 CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
 CT_GDB_NATIVE=y
diff --git a/linux-armv6/Dockerfile.in b/linux-armv6/Dockerfile.in
index fcc0465..40704ed 100644
--- a/linux-armv6/Dockerfile.in
+++ b/linux-armv6/Dockerfile.in
@@ -36,4 +36,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH arm
 
+RUN cd /usr/xcc/ && find . -name '*linux*'
+
 #include "common.label-and-env"
diff --git a/linux-m68k/crosstool-ng.config b/linux-m68k/crosstool-ng.config
index eb82c1b..3e22279 100644
--- a/linux-m68k/crosstool-ng.config
+++ b/linux-m68k/crosstool-ng.config
@@ -41,8 +41,7 @@ CT_MODULES=y
 # crosstool-NG behavior
 #
 # CT_OBSOLETE is not set
-CT_EXPERIMENTAL=y
-# CT_ALLOW_BUILD_AS_ROOT is not set
+# CT_EXPERIMENTAL is not set
 # CT_DEBUG_CT is not set
 
 #
@@ -89,10 +88,7 @@ CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512"
 CT_OVERRIDE_CONFIG_GUESS_SUB=y
 # CT_ONLY_EXTRACT is not set
 CT_PATCH_BUNDLED=y
-# CT_PATCH_LOCAL is not set
 # CT_PATCH_BUNDLED_LOCAL is not set
-# CT_PATCH_LOCAL_BUNDLED is not set
-# CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
 
 #
@@ -117,12 +113,11 @@ CT_CONFIG_SHELL="${bash}"
 # CT_LOG_ERROR is not set
 # CT_LOG_WARN is not set
 # CT_LOG_INFO is not set
-CT_LOG_EXTRA=y
-# CT_LOG_ALL is not set
+# CT_LOG_EXTRA is not set
+CT_LOG_ALL=y
 # CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="EXTRA"
+CT_LOG_LEVEL_MAX="ALL"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -134,16 +129,11 @@ CT_LOG_FILE_COMPRESS=y
 # CT_ARCH_ARC is not set
 # CT_ARCH_ARM is not set
 # CT_ARCH_AVR is not set
-# CT_ARCH_C6X is not set
 CT_ARCH_M68K=y
-# CT_ARCH_MICROBLAZE is not set
 # CT_ARCH_MIPS is not set
-# CT_ARCH_MOXIE is not set
-# CT_ARCH_MSP430 is not set
 # CT_ARCH_NIOS2 is not set
 # CT_ARCH_POWERPC is not set
 # CT_ARCH_PRU is not set
-# CT_ARCH_RISCV is not set
 # CT_ARCH_S390 is not set
 # CT_ARCH_SH is not set
 # CT_ARCH_SPARC is not set
@@ -210,9 +200,7 @@ CT_TARGET_ALIAS=""
 #
 # Toolchain type
 #
-# CT_NATIVE is not set
 CT_CROSS=y
-# CT_CROSS_NATIVE is not set
 # CT_CANADIAN is not set
 CT_TOOLCHAIN_TYPE="cross"
 
@@ -250,13 +238,6 @@ CT_LINUX_USE="LINUX"
 CT_LINUX_PKG_NAME="linux"
 CT_LINUX_SRC_RELEASE=y
 # CT_LINUX_SRC_DEVEL is not set
-# CT_LINUX_SRC_CUSTOM is not set
-CT_LINUX_PATCH_GLOBAL=y
-# CT_LINUX_PATCH_BUNDLED is not set
-# CT_LINUX_PATCH_LOCAL is not set
-# CT_LINUX_PATCH_BUNDLED_LOCAL is not set
-# CT_LINUX_PATCH_LOCAL_BUNDLED is not set
-# CT_LINUX_PATCH_NONE is not set
 CT_LINUX_PATCH_ORDER="global"
 CT_LINUX_V_5_11=y
 # CT_LINUX_V_5_10 is not set
@@ -311,7 +292,6 @@ CT_ALL_KERNEL_CHOICES="BARE_METAL LINUX WINDOWS"
 #
 # Common kernel options
 #
-CT_SHARED_LIBS=y
 # end of Operating System
 
 #
@@ -335,13 +315,6 @@ CT_BINUTILS_USE="BINUTILS"
 CT_BINUTILS_PKG_NAME="binutils"
 CT_BINUTILS_SRC_RELEASE=y
 # CT_BINUTILS_SRC_DEVEL is not set
-# CT_BINUTILS_SRC_CUSTOM is not set
-CT_BINUTILS_PATCH_GLOBAL=y
-# CT_BINUTILS_PATCH_BUNDLED is not set
-# CT_BINUTILS_PATCH_LOCAL is not set
-# CT_BINUTILS_PATCH_BUNDLED_LOCAL is not set
-# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
-# CT_BINUTILS_PATCH_NONE is not set
 CT_BINUTILS_PATCH_ORDER="global"
 CT_BINUTILS_V_2_36=y
 # CT_BINUTILS_V_2_35 is not set
@@ -403,13 +376,6 @@ CT_ELF2FLT_DEVEL_BRANCH=""
 CT_ELF2FLT_DEVEL_REVISION="453398f917d167f8c308c8f997270c48ae8f8b12"
 CT_ELF2FLT_DEVEL_SUBDIR=""
 CT_ELF2FLT_DEVEL_BOOTSTRAP=""
-# CT_ELF2FLT_SRC_CUSTOM is not set
-CT_ELF2FLT_PATCH_GLOBAL=y
-# CT_ELF2FLT_PATCH_BUNDLED is not set
-# CT_ELF2FLT_PATCH_LOCAL is not set
-# CT_ELF2FLT_PATCH_BUNDLED_LOCAL is not set
-# CT_ELF2FLT_PATCH_LOCAL_BUNDLED is not set
-# CT_ELF2FLT_PATCH_NONE is not set
 CT_ELF2FLT_PATCH_ORDER="global"
 CT_ELF2FLT_VERSION="unknown"
 CT_ELF2FLT_EXTRA_CONFIG_ARRAY=""
@@ -419,7 +385,6 @@ CT_ALL_BINUTILS_CHOICES="BINUTILS"
 #
 # C-library
 #
-# CT_LIBC_MUSL is not set
 CT_LIBC_UCLIBC=y
 CT_LIBC="uClibc"
 CT_LIBC_CHOICE_KSYM="UCLIBC"
@@ -436,13 +401,6 @@ CT_UCLIBC_USE="UCLIBC_NG"
 CT_UCLIBC_NG_PKG_NAME="uClibc-ng"
 CT_UCLIBC_NG_SRC_RELEASE=y
 # CT_UCLIBC_NG_SRC_DEVEL is not set
-# CT_UCLIBC_NG_SRC_CUSTOM is not set
-CT_UCLIBC_NG_PATCH_GLOBAL=y
-# CT_UCLIBC_NG_PATCH_BUNDLED is not set
-# CT_UCLIBC_NG_PATCH_LOCAL is not set
-# CT_UCLIBC_NG_PATCH_BUNDLED_LOCAL is not set
-# CT_UCLIBC_NG_PATCH_LOCAL_BUNDLED is not set
-# CT_UCLIBC_NG_PATCH_NONE is not set
 CT_UCLIBC_NG_PATCH_ORDER="global"
 CT_UCLIBC_NG_V_1_0_36=y
 # CT_UCLIBC_NG_V_1_0_33 is not set
@@ -486,9 +444,9 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL=0
 CT_LIBC_UCLIBC_CONFIG_FILE=""
 CT_LIBC_UCLIBC_LNXTHRD=""
 # CT_LIBC_UCLIBC_LOCALES is not set
-CT_LIBC_UCLIBC_LIBICONV=y
-# CT_LIBC_UCLIBC_IPV6 is not set
-# CT_LIBC_UCLIBC_WCHAR is not set
+# CT_LIBC_UCLIBC_LIBICONV is not set
+CT_LIBC_UCLIBC_IPV6=y
+CT_LIBC_UCLIBC_WCHAR=y
 # CT_LIBC_UCLIBC_FENV is not set
 CT_LIBC_UCLIBC_HAS_SSP=y
 # CT_LIBC_UCLIBC_BUILD_SSP is not set
@@ -504,8 +462,6 @@ CT_LIBC_SUPPORT_THREADS_NONE=y
 # CT_THREADS_NATIVE is not set
 CT_THREADS_LT=y
 # CT_THREADS_NONE is not set
-# CT_CREATE_LDSO_CONF is not set
-CT_LIBC_XLDD=y
 # end of C-library
 
 #
@@ -531,19 +487,11 @@ CT_CC_GCC_SHOW=y
 CT_CC_GCC_PKG_KSYM="GCC"
 CT_GCC_DIR_NAME="gcc"
 CT_GCC_USE_GNU=y
-# CT_GCC_USE_LINARO is not set
 # CT_GCC_USE_ORACLE is not set
 CT_GCC_USE="GCC"
 CT_GCC_PKG_NAME="gcc"
 CT_GCC_SRC_RELEASE=y
 # CT_GCC_SRC_DEVEL is not set
-# CT_GCC_SRC_CUSTOM is not set
-CT_GCC_PATCH_GLOBAL=y
-# CT_GCC_PATCH_BUNDLED is not set
-# CT_GCC_PATCH_LOCAL is not set
-# CT_GCC_PATCH_BUNDLED_LOCAL is not set
-# CT_GCC_PATCH_LOCAL_BUNDLED is not set
-# CT_GCC_PATCH_NONE is not set
 CT_GCC_PATCH_ORDER="global"
 CT_GCC_V_11=y
 # CT_GCC_V_10 is not set
@@ -600,7 +548,7 @@ CT_CC_GCC_LIBQUADMATH=y
 # Misc. obscure options.
 #
 CT_CC_CXA_ATEXIT=y
-CT_CC_GCC_DISABLE_PCH=y
+# CT_CC_GCC_DISABLE_PCH is not set
 CT_CC_GCC_SJLJ_EXCEPTIONS=m
 CT_CC_GCC_LDBL_128=m
 # CT_CC_GCC_BUILD_ID is not set
@@ -619,20 +567,58 @@ CT_ALL_CC_CHOICES="GCC"
 #
 # Additional supported languages:
 #
-CT_CC_LANG_CXX=y
-CT_CC_LANG_FORTRAN=y
-# CT_CC_LANG_ADA is not set
-# CT_CC_LANG_OBJC is not set
-# CT_CC_LANG_OBJCXX is not set
-# CT_CC_LANG_GOLANG is not set
-CT_CC_LANG_OTHERS=""
+# CT_CC_LANG_CXX is not set
+# CT_CC_LANG_FORTRAN is not set
 # end of C compiler
 
 #
 # Debug facilities
 #
 # CT_DEBUG_DUMA is not set
-# CT_DEBUG_GDB is not set
+CT_DEBUG_GDB=y
+CT_DEBUG_GDB_PKG_KSYM="GDB"
+CT_GDB_DIR_NAME="gdb"
+CT_GDB_USE_GNU=y
+CT_GDB_USE="GDB"
+CT_GDB_PKG_NAME="gdb"
+CT_GDB_SRC_RELEASE=y
+# CT_GDB_SRC_DEVEL is not set
+CT_GDB_PATCH_ORDER="global"
+CT_GDB_V_9_2=y
+# CT_GDB_V_8_3 is not set
+# CT_GDB_V_8_2 is not set
+# CT_GDB_V_8_1 is not set
+# CT_GDB_V_8_0 is not set
+# CT_GDB_V_7_12 is not set
+# CT_GDB_V_7_11 is not set
+CT_GDB_VERSION="9.2"
+CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
+CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
+CT_GDB_SIGNATURE_FORMAT=""
+CT_GDB_later_than_8_3=y
+CT_GDB_8_3_or_later=y
+CT_GDB_later_than_8_0=y
+CT_GDB_8_0_or_later=y
+CT_GDB_later_than_7_12=y
+CT_GDB_7_12_or_later=y
+CT_GDB_later_than_7_2=y
+CT_GDB_7_2_or_later=y
+CT_GDB_later_than_7_0=y
+CT_GDB_7_0_or_later=y
+CT_GDB_CROSS=y
+# CT_GDB_CROSS_STATIC is not set
+# CT_GDB_CROSS_SIM is not set
+# CT_GDB_CROSS_PYTHON is not set
+CT_GDB_CROSS_PYTHON_BINARY=""
+CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
+CT_GDB_GDBSERVER=y
+# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
+CT_GDB_HAS_PKGVERSION_BUGURL=y
+# CT_GDB_HAS_PYTHON is not set
+CT_GDB_INSTALL_GDBINIT=y
+CT_GDB_HAS_IPA_LIB=y
 # CT_DEBUG_LTRACE is not set
 # CT_DEBUG_STRACE is not set
 CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
@@ -642,44 +628,13 @@ CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
 # Companion libraries
 #
 # CT_COMPLIBS_CHECK is not set
-CT_COMP_LIBS_CLOOG=y
-CT_COMP_LIBS_CLOOG_PKG_KSYM="CLOOG"
-CT_CLOOG_DIR_NAME="cloog"
-CT_CLOOG_PKG_NAME="cloog"
-CT_CLOOG_SRC_RELEASE=y
-# CT_CLOOG_SRC_DEVEL is not set
-# CT_CLOOG_SRC_CUSTOM is not set
-CT_CLOOG_PATCH_GLOBAL=y
-# CT_CLOOG_PATCH_BUNDLED is not set
-# CT_CLOOG_PATCH_LOCAL is not set
-# CT_CLOOG_PATCH_BUNDLED_LOCAL is not set
-# CT_CLOOG_PATCH_LOCAL_BUNDLED is not set
-# CT_CLOOG_PATCH_NONE is not set
-CT_CLOOG_PATCH_ORDER="global"
-CT_CLOOG_V_0_18_4=y
-CT_CLOOG_VERSION="0.18.4"
-CT_CLOOG_MIRRORS="http://www.bastoul.net/cloog/pages/download ftp://gcc.gnu.org/pub/gcc/infrastructure"
-CT_CLOOG_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_CLOOG_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_CLOOG_ARCHIVE_FORMATS=".tar.gz"
-CT_CLOOG_SIGNATURE_FORMAT=""
-CT_CLOOG_0_18_4_or_later=y
-CT_CLOOG_0_18_4_or_older=y
-CT_CLOOG_later_than_0_18_1=y
-CT_CLOOG_0_18_1_or_later=y
+# CT_COMP_LIBS_CLOOG is not set
 CT_COMP_LIBS_EXPAT=y
 CT_COMP_LIBS_EXPAT_PKG_KSYM="EXPAT"
 CT_EXPAT_DIR_NAME="expat"
 CT_EXPAT_PKG_NAME="expat"
 CT_EXPAT_SRC_RELEASE=y
 # CT_EXPAT_SRC_DEVEL is not set
-# CT_EXPAT_SRC_CUSTOM is not set
-CT_EXPAT_PATCH_GLOBAL=y
-# CT_EXPAT_PATCH_BUNDLED is not set
-# CT_EXPAT_PATCH_LOCAL is not set
-# CT_EXPAT_PATCH_BUNDLED_LOCAL is not set
-# CT_EXPAT_PATCH_LOCAL_BUNDLED is not set
-# CT_EXPAT_PATCH_NONE is not set
 CT_EXPAT_PATCH_ORDER="global"
 CT_EXPAT_V_2_3=y
 CT_EXPAT_VERSION="2.3.0"
@@ -688,41 +643,13 @@ CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_EXPAT_ARCHIVE_FORMATS=".tar.xz .tar.lz .tar.bz2 .tar.gz"
 CT_EXPAT_SIGNATURE_FORMAT=""
-CT_COMP_LIBS_GETTEXT=y
-CT_COMP_LIBS_GETTEXT_PKG_KSYM="GETTEXT"
-CT_GETTEXT_DIR_NAME="gettext"
-CT_GETTEXT_PKG_NAME="gettext"
-CT_GETTEXT_SRC_RELEASE=y
-# CT_GETTEXT_SRC_DEVEL is not set
-# CT_GETTEXT_SRC_CUSTOM is not set
-CT_GETTEXT_PATCH_GLOBAL=y
-# CT_GETTEXT_PATCH_BUNDLED is not set
-# CT_GETTEXT_PATCH_LOCAL is not set
-# CT_GETTEXT_PATCH_BUNDLED_LOCAL is not set
-# CT_GETTEXT_PATCH_LOCAL_BUNDLED is not set
-# CT_GETTEXT_PATCH_NONE is not set
-CT_GETTEXT_PATCH_ORDER="global"
-CT_GETTEXT_V_0_20_1=y
-# CT_GETTEXT_V_0_19_8_1 is not set
-CT_GETTEXT_VERSION="0.20.1"
-CT_GETTEXT_MIRRORS="$(CT_Mirrors GNU gettext)"
-CT_GETTEXT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_GETTEXT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_GETTEXT_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_GETTEXT_SIGNATURE_FORMAT="packed/.sig"
+# CT_COMP_LIBS_GETTEXT is not set
 CT_COMP_LIBS_GMP=y
 CT_COMP_LIBS_GMP_PKG_KSYM="GMP"
 CT_GMP_DIR_NAME="gmp"
 CT_GMP_PKG_NAME="gmp"
 CT_GMP_SRC_RELEASE=y
 # CT_GMP_SRC_DEVEL is not set
-# CT_GMP_SRC_CUSTOM is not set
-CT_GMP_PATCH_GLOBAL=y
-# CT_GMP_PATCH_BUNDLED is not set
-# CT_GMP_PATCH_LOCAL is not set
-# CT_GMP_PATCH_BUNDLED_LOCAL is not set
-# CT_GMP_PATCH_LOCAL_BUNDLED is not set
-# CT_GMP_PATCH_NONE is not set
 CT_GMP_PATCH_ORDER="global"
 CT_GMP_V_6_2=y
 # CT_GMP_V_6_1 is not set
@@ -743,13 +670,6 @@ CT_ISL_DIR_NAME="isl"
 CT_ISL_PKG_NAME="isl"
 CT_ISL_SRC_RELEASE=y
 # CT_ISL_SRC_DEVEL is not set
-# CT_ISL_SRC_CUSTOM is not set
-CT_ISL_PATCH_GLOBAL=y
-# CT_ISL_PATCH_BUNDLED is not set
-# CT_ISL_PATCH_LOCAL is not set
-# CT_ISL_PATCH_BUNDLED_LOCAL is not set
-# CT_ISL_PATCH_LOCAL_BUNDLED is not set
-# CT_ISL_PATCH_NONE is not set
 CT_ISL_PATCH_ORDER="global"
 CT_ISL_V_0_22=y
 # CT_ISL_V_0_21 is not set
@@ -778,62 +698,14 @@ CT_ISL_0_13_or_later=y
 CT_ISL_later_than_0_12=y
 CT_ISL_0_12_or_later=y
 CT_ISL_REQUIRE_0_12_or_later=y
-CT_COMP_LIBS_LIBELF=y
-CT_COMP_LIBS_LIBELF_PKG_KSYM="LIBELF"
-CT_LIBELF_DIR_NAME="libelf"
-CT_LIBELF_PKG_NAME="libelf"
-CT_LIBELF_SRC_RELEASE=y
-# CT_LIBELF_SRC_DEVEL is not set
-# CT_LIBELF_SRC_CUSTOM is not set
-CT_LIBELF_PATCH_GLOBAL=y
-# CT_LIBELF_PATCH_BUNDLED is not set
-# CT_LIBELF_PATCH_LOCAL is not set
-# CT_LIBELF_PATCH_BUNDLED_LOCAL is not set
-# CT_LIBELF_PATCH_LOCAL_BUNDLED is not set
-# CT_LIBELF_PATCH_NONE is not set
-CT_LIBELF_PATCH_ORDER="global"
-CT_LIBELF_V_0_8=y
-CT_LIBELF_VERSION="0.8.13"
-CT_LIBELF_MIRRORS="https://fossies.org/linux/misc/old http://oe-lite.org/mirror/libelf/ http://ftp.osuosl.org/pub/blfs/conglomeration/libelf/"
-CT_LIBELF_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_LIBELF_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_LIBELF_ARCHIVE_FORMATS=".tar.gz"
-CT_LIBELF_SIGNATURE_FORMAT=""
-CT_COMP_LIBS_LIBICONV=y
-CT_COMP_LIBS_LIBICONV_PKG_KSYM="LIBICONV"
-CT_LIBICONV_DIR_NAME="libiconv"
-CT_LIBICONV_PKG_NAME="libiconv"
-CT_LIBICONV_SRC_RELEASE=y
-# CT_LIBICONV_SRC_DEVEL is not set
-# CT_LIBICONV_SRC_CUSTOM is not set
-CT_LIBICONV_PATCH_GLOBAL=y
-# CT_LIBICONV_PATCH_BUNDLED is not set
-# CT_LIBICONV_PATCH_LOCAL is not set
-# CT_LIBICONV_PATCH_BUNDLED_LOCAL is not set
-# CT_LIBICONV_PATCH_LOCAL_BUNDLED is not set
-# CT_LIBICONV_PATCH_NONE is not set
-CT_LIBICONV_PATCH_ORDER="global"
-CT_LIBICONV_V_1_16=y
-# CT_LIBICONV_V_1_15 is not set
-CT_LIBICONV_VERSION="1.16"
-CT_LIBICONV_MIRRORS="$(CT_Mirrors GNU libiconv)"
-CT_LIBICONV_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_LIBICONV_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_LIBICONV_ARCHIVE_FORMATS=".tar.gz"
-CT_LIBICONV_SIGNATURE_FORMAT="packed/.sig"
+# CT_COMP_LIBS_LIBELF is not set
+# CT_COMP_LIBS_LIBICONV is not set
 CT_COMP_LIBS_MPC=y
 CT_COMP_LIBS_MPC_PKG_KSYM="MPC"
 CT_MPC_DIR_NAME="mpc"
 CT_MPC_PKG_NAME="mpc"
 CT_MPC_SRC_RELEASE=y
 # CT_MPC_SRC_DEVEL is not set
-# CT_MPC_SRC_CUSTOM is not set
-CT_MPC_PATCH_GLOBAL=y
-# CT_MPC_PATCH_BUNDLED is not set
-# CT_MPC_PATCH_LOCAL is not set
-# CT_MPC_PATCH_BUNDLED_LOCAL is not set
-# CT_MPC_PATCH_LOCAL_BUNDLED is not set
-# CT_MPC_PATCH_NONE is not set
 CT_MPC_PATCH_ORDER="global"
 CT_MPC_V_1_2=y
 # CT_MPC_V_1_1 is not set
@@ -852,13 +724,6 @@ CT_MPFR_DIR_NAME="mpfr"
 CT_MPFR_PKG_NAME="mpfr"
 CT_MPFR_SRC_RELEASE=y
 # CT_MPFR_SRC_DEVEL is not set
-# CT_MPFR_SRC_CUSTOM is not set
-CT_MPFR_PATCH_GLOBAL=y
-# CT_MPFR_PATCH_BUNDLED is not set
-# CT_MPFR_PATCH_LOCAL is not set
-# CT_MPFR_PATCH_BUNDLED_LOCAL is not set
-# CT_MPFR_PATCH_LOCAL_BUNDLED is not set
-# CT_MPFR_PATCH_NONE is not set
 CT_MPFR_PATCH_ORDER="global"
 CT_MPFR_V_4_1=y
 # CT_MPFR_V_4_0 is not set
@@ -880,13 +745,6 @@ CT_NCURSES_DIR_NAME="ncurses"
 CT_NCURSES_PKG_NAME="ncurses"
 CT_NCURSES_SRC_RELEASE=y
 # CT_NCURSES_SRC_DEVEL is not set
-# CT_NCURSES_SRC_CUSTOM is not set
-CT_NCURSES_PATCH_GLOBAL=y
-# CT_NCURSES_PATCH_BUNDLED is not set
-# CT_NCURSES_PATCH_LOCAL is not set
-# CT_NCURSES_PATCH_BUNDLED_LOCAL is not set
-# CT_NCURSES_PATCH_LOCAL_BUNDLED is not set
-# CT_NCURSES_PATCH_NONE is not set
 CT_NCURSES_PATCH_ORDER="global"
 CT_NCURSES_V_6_2=y
 # CT_NCURSES_V_6_1 is not set
@@ -897,7 +755,6 @@ CT_NCURSES_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_NCURSES_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_NCURSES_ARCHIVE_FORMATS=".tar.gz"
 CT_NCURSES_SIGNATURE_FORMAT="packed/.sig"
-# CT_NCURSES_NEW_ABI is not set
 CT_NCURSES_HOST_CONFIG_ARGS=""
 CT_NCURSES_HOST_DISABLE_DB=y
 CT_NCURSES_HOST_FALLBACKS="linux,xterm,xterm-color,xterm-256color,vt100"
@@ -910,13 +767,6 @@ CT_ZLIB_DIR_NAME="zlib"
 CT_ZLIB_PKG_NAME="zlib"
 CT_ZLIB_SRC_RELEASE=y
 # CT_ZLIB_SRC_DEVEL is not set
-# CT_ZLIB_SRC_CUSTOM is not set
-CT_ZLIB_PATCH_GLOBAL=y
-# CT_ZLIB_PATCH_BUNDLED is not set
-# CT_ZLIB_PATCH_LOCAL is not set
-# CT_ZLIB_PATCH_BUNDLED_LOCAL is not set
-# CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
-# CT_ZLIB_PATCH_NONE is not set
 CT_ZLIB_PATCH_ORDER="global"
 CT_ZLIB_V_1_2_11=y
 CT_ZLIB_VERSION="1.2.11"
@@ -926,20 +776,20 @@ CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
 CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB"
-CT_LIBICONV_NEEDED=y
-CT_GETTEXT_NEEDED=y
+# CT_LIBICONV_NEEDED is not set
+# CT_GETTEXT_NEEDED is not set
 CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
+CT_EXPAT_NEEDED=y
 CT_NCURSES_NEEDED=y
 CT_ZLIB_NEEDED=y
-CT_LIBICONV=y
-CT_GETTEXT=y
 CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
+CT_EXPAT=y
 CT_NCURSES=y
 CT_ZLIB=y
 # end of Companion libraries
@@ -954,13 +804,6 @@ CT_AUTOCONF_DIR_NAME="autoconf"
 CT_AUTOCONF_PKG_NAME="autoconf"
 CT_AUTOCONF_SRC_RELEASE=y
 # CT_AUTOCONF_SRC_DEVEL is not set
-# CT_AUTOCONF_SRC_CUSTOM is not set
-CT_AUTOCONF_PATCH_GLOBAL=y
-# CT_AUTOCONF_PATCH_BUNDLED is not set
-# CT_AUTOCONF_PATCH_LOCAL is not set
-# CT_AUTOCONF_PATCH_BUNDLED_LOCAL is not set
-# CT_AUTOCONF_PATCH_LOCAL_BUNDLED is not set
-# CT_AUTOCONF_PATCH_NONE is not set
 CT_AUTOCONF_PATCH_ORDER="global"
 CT_AUTOCONF_V_2_69=y
 # CT_AUTOCONF_V_2_65 is not set
@@ -976,13 +819,6 @@ CT_AUTOMAKE_DIR_NAME="automake"
 CT_AUTOMAKE_PKG_NAME="automake"
 CT_AUTOMAKE_SRC_RELEASE=y
 # CT_AUTOMAKE_SRC_DEVEL is not set
-# CT_AUTOMAKE_SRC_CUSTOM is not set
-CT_AUTOMAKE_PATCH_GLOBAL=y
-# CT_AUTOMAKE_PATCH_BUNDLED is not set
-# CT_AUTOMAKE_PATCH_LOCAL is not set
-# CT_AUTOMAKE_PATCH_BUNDLED_LOCAL is not set
-# CT_AUTOMAKE_PATCH_LOCAL_BUNDLED is not set
-# CT_AUTOMAKE_PATCH_NONE is not set
 CT_AUTOMAKE_PATCH_ORDER="global"
 CT_AUTOMAKE_V_1_16=y
 # CT_AUTOMAKE_V_1_15 is not set
@@ -998,13 +834,6 @@ CT_BISON_DIR_NAME="bison"
 CT_BISON_PKG_NAME="bison"
 CT_BISON_SRC_RELEASE=y
 # CT_BISON_SRC_DEVEL is not set
-# CT_BISON_SRC_CUSTOM is not set
-CT_BISON_PATCH_GLOBAL=y
-# CT_BISON_PATCH_BUNDLED is not set
-# CT_BISON_PATCH_LOCAL is not set
-# CT_BISON_PATCH_BUNDLED_LOCAL is not set
-# CT_BISON_PATCH_LOCAL_BUNDLED is not set
-# CT_BISON_PATCH_NONE is not set
 CT_BISON_PATCH_ORDER="global"
 CT_BISON_V_3_5=y
 # CT_BISON_V_3_4 is not set
@@ -1024,13 +853,6 @@ CT_DTC_DIR_NAME="dtc"
 CT_DTC_PKG_NAME="dtc"
 CT_DTC_SRC_RELEASE=y
 # CT_DTC_SRC_DEVEL is not set
-# CT_DTC_SRC_CUSTOM is not set
-CT_DTC_PATCH_GLOBAL=y
-# CT_DTC_PATCH_BUNDLED is not set
-# CT_DTC_PATCH_LOCAL is not set
-# CT_DTC_PATCH_BUNDLED_LOCAL is not set
-# CT_DTC_PATCH_LOCAL_BUNDLED is not set
-# CT_DTC_PATCH_NONE is not set
 CT_DTC_PATCH_ORDER="global"
 CT_DTC_V_1_6=y
 # CT_DTC_V_1_5 is not set
@@ -1048,13 +870,6 @@ CT_LIBTOOL_DIR_NAME="libtool"
 CT_LIBTOOL_PKG_NAME="libtool"
 CT_LIBTOOL_SRC_RELEASE=y
 # CT_LIBTOOL_SRC_DEVEL is not set
-# CT_LIBTOOL_SRC_CUSTOM is not set
-CT_LIBTOOL_PATCH_GLOBAL=y
-# CT_LIBTOOL_PATCH_BUNDLED is not set
-# CT_LIBTOOL_PATCH_LOCAL is not set
-# CT_LIBTOOL_PATCH_BUNDLED_LOCAL is not set
-# CT_LIBTOOL_PATCH_LOCAL_BUNDLED is not set
-# CT_LIBTOOL_PATCH_NONE is not set
 CT_LIBTOOL_PATCH_ORDER="global"
 CT_LIBTOOL_V_2_4=y
 CT_LIBTOOL_VERSION="2.4.6"
@@ -1069,13 +884,6 @@ CT_M4_DIR_NAME="m4"
 CT_M4_PKG_NAME="m4"
 CT_M4_SRC_RELEASE=y
 # CT_M4_SRC_DEVEL is not set
-# CT_M4_SRC_CUSTOM is not set
-CT_M4_PATCH_GLOBAL=y
-# CT_M4_PATCH_BUNDLED is not set
-# CT_M4_PATCH_LOCAL is not set
-# CT_M4_PATCH_BUNDLED_LOCAL is not set
-# CT_M4_PATCH_LOCAL_BUNDLED is not set
-# CT_M4_PATCH_NONE is not set
 CT_M4_PATCH_ORDER="global"
 CT_M4_V_1_4=y
 CT_M4_VERSION="1.4.18"
@@ -1090,13 +898,6 @@ CT_MAKE_DIR_NAME="make"
 CT_MAKE_PKG_NAME="make"
 CT_MAKE_SRC_RELEASE=y
 # CT_MAKE_SRC_DEVEL is not set
-# CT_MAKE_SRC_CUSTOM is not set
-CT_MAKE_PATCH_GLOBAL=y
-# CT_MAKE_PATCH_BUNDLED is not set
-# CT_MAKE_PATCH_LOCAL is not set
-# CT_MAKE_PATCH_BUNDLED_LOCAL is not set
-# CT_MAKE_PATCH_LOCAL_BUNDLED is not set
-# CT_MAKE_PATCH_NONE is not set
 CT_MAKE_PATCH_ORDER="global"
 CT_MAKE_V_4_3=y
 # CT_MAKE_V_4_2 is not set
@@ -1112,9 +913,3 @@ CT_MAKE_4_0_or_later=y
 # CT_MAKE_GNUMAKE_SYMLINK is not set
 CT_ALL_COMP_TOOLS_CHOICES="AUTOCONF AUTOMAKE BISON DTC LIBTOOL M4 MAKE"
 # end of Companion tools
-
-#
-# Test suite
-#
-# CT_TEST_SUITE_GCC is not set
-# end of Test suite
diff --git a/linux-s390x/Dockerfile.in b/linux-s390x/Dockerfile.in
index c7b7141..dc2ecd8 100644
--- a/linux-s390x/Dockerfile.in
+++ b/linux-s390x/Dockerfile.in
@@ -34,6 +34,4 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH s390
 
-#include "common.lib"
-
 #include "common.label-and-env"