ptxconfigs: update configs after host-system-* and cross-gcc changes

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

19 files changed, 133 insertions, 228 deletions

diff --git a/ptxconfigs/aarch64-v8a-linux-gnu_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/aarch64-v8a-linux-gnu_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index f9ccace..af5651a 100644
--- a/ptxconfigs/aarch64-v8a-linux-gnu_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/aarch64-v8a-linux-gnu_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-abi=lp64 --with-arch=armv8-a --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -115,18 +111,17 @@ PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
 PTXCONF_HOST_CMAKE=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
 PTXCONF_HOST_NINJA=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index f99f749..51efe05 100644
--- a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=softfp --with-fpu=vfp --with-cpu=arm1136jf-s --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -106,17 +102,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index 0c1d453..8d71469 100644
--- a/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=vfp --with-cpu=arm1136jf-s --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -106,17 +102,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index cdc5214..53bbdd3 100644
--- a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-arch=armv4t --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -106,17 +102,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index 3321d36..58f49aa 100644
--- a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=arm926ej-s --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -106,17 +102,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/arm-v7a-linux-gnueabi_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/arm-v7a-linux-gnueabi_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index 6115332..89ea690 100644
--- a/ptxconfigs/arm-v7a-linux-gnueabi_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v7a-linux-gnueabi_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=softfp --with-fpu=vfpv3-d16 --with-arch=armv7-a --with-mode=thumb --with-tune=cortex-a9 --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -115,18 +111,17 @@ PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
 PTXCONF_HOST_CMAKE=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
 PTXCONF_HOST_NINJA=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index 0618693..78a9e29 100644
--- a/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a --with-mode=thumb --with-tune=cortex-a9 --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -115,18 +111,17 @@ PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
 PTXCONF_HOST_CMAKE=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
 PTXCONF_HOST_NINJA=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/arm-v7em-eabihf_gcc-10.2.1_newlib-3.3.0_binutils-2.35.ptxconfig b/ptxconfigs/arm-v7em-eabihf_gcc-10.2.1_newlib-3.3.0_binutils-2.35.ptxconfig
index e88cdf7..a66eb5d 100644
--- a/ptxconfigs/arm-v7em-eabihf_gcc-10.2.1_newlib-3.3.0_binutils-2.35.ptxconfig
+++ b/ptxconfigs/arm-v7em-eabihf_gcc-10.2.1_newlib-3.3.0_binutils-2.35.ptxconfig
@@ -52,10 +52,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=fpv4-sp-d16 --with-arch=armv7e-m --with-mode=thumb"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -93,17 +89,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-10.2.1_uclibc-ng-1.0.34_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-10.2.1_uclibc-ng-1.0.34_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index 9fef8e2..36fbd95 100644
--- a/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-10.2.1_uclibc-ng-1.0.34_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-10.2.1_uclibc-ng-1.0.34_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -60,10 +60,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=fpv4-sp-d16 --with-arch=armv7e-m --with-mode=thumb"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -100,17 +96,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/arm-v7m-eabi_gcc-10.2.1_newlib-3.3.0_binutils-2.35.ptxconfig b/ptxconfigs/arm-v7m-eabi_gcc-10.2.1_newlib-3.3.0_binutils-2.35.ptxconfig
index 3ded4b9..25328b1 100644
--- a/ptxconfigs/arm-v7m-eabi_gcc-10.2.1_newlib-3.3.0_binutils-2.35.ptxconfig
+++ b/ptxconfigs/arm-v7m-eabi_gcc-10.2.1_newlib-3.3.0_binutils-2.35.ptxconfig
@@ -52,10 +52,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-arch=armv7-m --with-mode=thumb"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -93,17 +89,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/arm-v7m-uclinuxeabi_gcc-10.2.1_uclibc-ng-1.0.34_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/arm-v7m-uclinuxeabi_gcc-10.2.1_uclibc-ng-1.0.34_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index 9e7a16e..60e30b1 100644
--- a/ptxconfigs/arm-v7m-uclinuxeabi_gcc-10.2.1_uclibc-ng-1.0.34_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v7m-uclinuxeabi_gcc-10.2.1_uclibc-ng-1.0.34_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -60,10 +60,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-arch=armv7-m --with-mode=thumb"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -100,17 +96,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/i586-unknown-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/i586-unknown-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index 8c8013b..55e5946 100644
--- a/ptxconfigs/i586-unknown-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/i586-unknown-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-arch=i586 --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -106,17 +102,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/i686-atom-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/i686-atom-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index 55ac5ed..308197d 100644
--- a/ptxconfigs/i686-atom-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/i686-atom-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-arch=atom --with-fpmath=sse --with-specs='%{!mmovbe:%{!mno-movbe:-mno-movbe}}' --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -106,17 +102,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/mips-softfloat-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/mips-softfloat-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index 59a9e7d..95b105e 100644
--- a/ptxconfigs/mips-softfloat-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/mips-softfloat-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -106,17 +102,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/mips64el-linux-gnuabi64_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/mips64el-linux-gnuabi64_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index 3426830..74ac915 100644
--- a/ptxconfigs/mips64el-linux-gnuabi64_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/mips64el-linux-gnuabi64_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-mips-plt --with-arch-64=mips64r2 --with-madd4=no --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -106,17 +102,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index 5a1289b..8a1c388 100644
--- a/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -106,17 +102,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/powerpc-603e-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/powerpc-603e-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index c241a6d..d5f8dae 100644
--- a/ptxconfigs/powerpc-603e-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/powerpc-603e-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-cpu=603e --disable-altivec --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -106,17 +102,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/riscv64-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/riscv64-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index c9f5f67..b410522 100644
--- a/ptxconfigs/riscv64-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/riscv64-linux-gnu_gcc-10.2.1_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA=" --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -106,17 +102,16 @@ PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-lat
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
diff --git a/ptxconfigs/x86_64-unknown-linux-gnu_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig b/ptxconfigs/x86_64-unknown-linux-gnu_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
index 5b9a6ac..579a93d 100644
--- a/ptxconfigs/x86_64-unknown-linux-gnu_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
+++ b/ptxconfigs/x86_64-unknown-linux-gnu_gcc-10.2.1_clang-10.0.0_glibc-2.32_binutils-2.35_kernel-5.6-sanitized.ptxconfig
@@ -66,10 +66,6 @@ PTXCONF_CROSS_GCC_VERSION="10.2.1"
 PTXCONF_CROSS_GCC_MD5="b86843def44634eb3c55a4339c347471"
 PTXCONF_CROSS_GCC_DL_VERSION="10-20200822"
 PTXCONF_CROSS_GCC_PKGVERSION="${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}"
-PTXCONF_CROSS_GCC_43=y
-PTXCONF_CROSS_GCC_45=y
-PTXCONF_CROSS_GCC_48=y
-PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA=" --enable-linker-build-id"
 PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
@@ -115,18 +111,17 @@ PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
 PTXCONF_HOST_CMAKE=y
-PTXCONF_HOST_EXPAT=y
-PTXCONF_HOST_GMP=y
-PTXCONF_HOST_ISL=y
-PTXCONF_HOST_LIBELF=y
 PTXCONF_HOST_M4=y
-PTXCONF_HOST_MPC=y
-PTXCONF_HOST_MPFR=y
 PTXCONF_HOST_NINJA=y
+PTXCONF_HOST_SYSTEM_EXPAT=y
+PTXCONF_HOST_SYSTEM_GMP=y
+PTXCONF_HOST_SYSTEM_ISL=y
+PTXCONF_HOST_SYSTEM_MPC=y
+PTXCONF_HOST_SYSTEM_MPFR=y
 PTXCONF_HOST_SYSTEM_PERL=y
 PTXCONF_HOST_SYSTEM_PYTHON3=y
-PTXCONF_HOST_XZ=y
-PTXCONF_HOST_ZLIB=y
+PTXCONF_HOST_SYSTEM_XZ=y
+PTXCONF_HOST_SYSTEM_ZLIB=y
 PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
 PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
 PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y