* ptxconfigs/*:

	regenerated


git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@7847 f8d472c7-5700-0410-ac5a-87979cec3adf

31 files changed, 125 insertions, 117 deletions

diff --git a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
index a136f9c..b2d0863 100644
--- a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
index 032abe1..18c7080 100644
--- a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
+++ b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-hardfloat/arm-v4t_hardfloat-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/arm-hardfloat/arm-v4t_hardfloat-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
index 8b9039a..ba24095 100644
--- a/ptxconfigs/arm-hardfloat/arm-v4t_hardfloat-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/arm-hardfloat/arm-v4t_hardfloat-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-hardfloat/arm-xscale_hardfloat-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/arm-hardfloat/arm-xscale_hardfloat-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
index d672595..b7a40ca 100644
--- a/ptxconfigs/arm-hardfloat/arm-xscale_hardfloat-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/arm-hardfloat/arm-xscale_hardfloat-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-iwmmx-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/arm-iwmmx-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
index 13de4a9..ecca2c1 100644
--- a/ptxconfigs/arm-iwmmx-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/arm-iwmmx-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-iwmmx-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig b/ptxconfigs/arm-iwmmx-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
index 4b39302..d2e6381 100644
--- a/ptxconfigs/arm-iwmmx-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
+++ b/ptxconfigs/arm-iwmmx-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-oabi/arm-v4t-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/arm-oabi/arm-v4t-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
index 070d892..3af0be9 100644
--- a/ptxconfigs/arm-oabi/arm-v4t-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/arm-oabi/arm-v4t-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-oabi/arm-xscale-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/arm-oabi/arm-xscale-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
index 87d23c4..b2d148b 100644
--- a/ptxconfigs/arm-oabi/arm-xscale-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/arm-oabi/arm-xscale-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-oabi/armeb-xscale-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/arm-oabi/armeb-xscale-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
index 036079c..be1f49d 100644
--- a/ptxconfigs/arm-oabi/armeb-xscale-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/arm-oabi/armeb-xscale-linux-gnu_gcc-4.0.4_glibc-2.3.6_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
index 7c04660..37da953 100644
--- a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -59,7 +59,7 @@ PTXCONF_CROSS_BINUTILS_VERSION="2.17"
 #
 PTXCONF_KERNEL_HEADERS=y
 PTXCONF_KERNEL_HEADERS_VERSION="2.6.18"
-PTXCONF_KERNEL_HEADERS_SANITIZED=y
+# PTXCONF_KERNEL_HEADERS_SANITIZED is not set
 PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.1.2"
 # PTXCONF_CROSS_GCC_43 is not set
@@ -96,7 +96,6 @@ PTXCONF_CROSS_TOOLCHAIN=y
 # misc                        
 #
 PTXCONF_PREFIX="/opt"
-PTXCONF_PREFIX_KERNEL="-sanitized"
 PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}"
 PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host"
 PTXCONF_SYSROOT_CROSS="${PTX_AUTOBUILD_DESTDIR}${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}"
diff --git a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
index 25fa9e1..a431df0 100644
--- a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
index 9401ea8..38d6980 100644
--- a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
index 2c8ec94..d9ee3e2 100644
--- a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-xscale-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/arm-xscale-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
index 0961f0a..6a057c0 100644
--- a/ptxconfigs/arm-xscale-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/arm-xscale-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/arm-xscale-linux-gnueabi_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig b/ptxconfigs/arm-xscale-linux-gnueabi_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
index 3199f36..713e999 100644
--- a/ptxconfigs/arm-xscale-linux-gnueabi_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
+++ b/ptxconfigs/arm-xscale-linux-gnueabi_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/armeb-xscale-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/armeb-xscale-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
index b65b25c..ba6c959 100644
--- a/ptxconfigs/armeb-xscale-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/armeb-xscale-linux-gnueabi_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/armeb-xscale-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig b/ptxconfigs/armeb-xscale-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
index 0e026d8..6da0c48 100644
--- a/ptxconfigs/armeb-xscale-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
+++ b/ptxconfigs/armeb-xscale-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -62,7 +62,7 @@ PTXCONF_KERNEL_HEADERS_VERSION="2.6.27"
 PTXCONF_KERNEL_HEADERS_SANITIZED=y
 PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.3.2"
-# PTXCONF_CROSS_GCC_43 is not set
+PTXCONF_CROSS_GCC_43=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
 
@@ -87,6 +87,8 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="6.8"
 PTXCONF_CROSS_TOOLCHAIN=y
+PTXCONF_HOST_GMP=y
+PTXCONF_HOST_MPFR=y
 
 #
 # ----------------------------------
diff --git a/ptxconfigs/avr/avr_gcc-3.4.6_libc-1.0.5_binutils-2.15.ptxconfig b/ptxconfigs/avr/avr_gcc-3.4.6_libc-1.0.5_binutils-2.15.ptxconfig
index dd8ae09..2f76993 100644
--- a/ptxconfigs/avr/avr_gcc-3.4.6_libc-1.0.5_binutils-2.15.ptxconfig
+++ b/ptxconfigs/avr/avr_gcc-3.4.6_libc-1.0.5_binutils-2.15.ptxconfig
@@ -74,7 +74,6 @@ PTXCONF_CROSS_TOOLCHAIN=y
 #
 # ----------------------------------
 #
-# PTXCONF_TOOLCHAIN_CC is not set
 
 #
 # misc                        
diff --git a/ptxconfigs/avr/avr_gcc-4.1.2_libc-1.4.8_binutils-2.17.ptxconfig b/ptxconfigs/avr/avr_gcc-4.1.2_libc-1.4.8_binutils-2.17.ptxconfig
index bbb7769..13bc808 100644
--- a/ptxconfigs/avr/avr_gcc-4.1.2_libc-1.4.8_binutils-2.17.ptxconfig
+++ b/ptxconfigs/avr/avr_gcc-4.1.2_libc-1.4.8_binutils-2.17.ptxconfig
@@ -74,7 +74,6 @@ PTXCONF_CROSS_TOOLCHAIN=y
 #
 # ----------------------------------
 #
-# PTXCONF_TOOLCHAIN_CC is not set
 
 #
 # misc                        
diff --git a/ptxconfigs/avr/avr_gcc-4.3.2_libc-1.6.2_binutils-2.18.93.ptxconfig b/ptxconfigs/avr/avr_gcc-4.3.2_libc-1.6.2_binutils-2.18.93.ptxconfig
index 5f535f2..e2a98b9 100644
--- a/ptxconfigs/avr/avr_gcc-4.3.2_libc-1.6.2_binutils-2.18.93.ptxconfig
+++ b/ptxconfigs/avr/avr_gcc-4.3.2_libc-1.6.2_binutils-2.18.93.ptxconfig
@@ -41,7 +41,7 @@ PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.18.93"
 PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.3.2"
-# PTXCONF_CROSS_GCC_43 is not set
+PTXCONF_CROSS_GCC_43=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA=""
 
@@ -70,11 +70,12 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="6.8"
 PTXCONF_CROSS_TOOLCHAIN=y
+PTXCONF_HOST_GMP=y
+PTXCONF_HOST_MPFR=y
 
 #
 # ----------------------------------
 #
-# PTXCONF_TOOLCHAIN_CC is not set
 
 #
 # misc                        
diff --git a/ptxconfigs/i586-unknown-linux-gnu_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/i586-unknown-linux-gnu_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
index 2be62f4..7e9a761 100644
--- a/ptxconfigs/i586-unknown-linux-gnu_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/i586-unknown-linux-gnu_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/i586-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig b/ptxconfigs/i586-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
index 07e7487..99054a9 100644
--- a/ptxconfigs/i586-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
+++ b/ptxconfigs/i586-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/i686-unknown-linux-gnu_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/i686-unknown-linux-gnu_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
index e831b45..81dbf7f 100644
--- a/ptxconfigs/i686-unknown-linux-gnu_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/i686-unknown-linux-gnu_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig b/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
index 8231180..2e860d0 100644
--- a/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
+++ b/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -59,7 +59,7 @@ PTXCONF_KERNEL_HEADERS_VERSION="2.6.27"
 PTXCONF_KERNEL_HEADERS_SANITIZED=y
 PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.3.2"
-# PTXCONF_CROSS_GCC_43 is not set
+PTXCONF_CROSS_GCC_43=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-arch=i686"
 
@@ -84,6 +84,8 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="6.8"
 PTXCONF_CROSS_TOOLCHAIN=y
+PTXCONF_HOST_GMP=y
+PTXCONF_HOST_MPFR=y
 
 #
 # ----------------------------------
diff --git a/ptxconfigs/java/arm-v5te-linux-gnueabi_gcc-4.3.2_java_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig b/ptxconfigs/java/arm-v5te-linux-gnueabi_gcc-4.3.2_java_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
index 1a4bea3..1c51350 100644
--- a/ptxconfigs/java/arm-v5te-linux-gnueabi_gcc-4.3.2_java_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
+++ b/ptxconfigs/java/arm-v5te-linux-gnueabi_gcc-4.3.2_java_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/mingw/i586-mingw32msvc_gcc-4.3.2_mingw-3.15.1_w32api-3.12_binutils-2.18.ptxconfig b/ptxconfigs/mingw/i586-mingw32msvc_gcc-4.3.2_mingw-3.15.1_w32api-3.12_binutils-2.18.ptxconfig
index ff7fc10..6ba79e1 100644
--- a/ptxconfigs/mingw/i586-mingw32msvc_gcc-4.3.2_mingw-3.15.1_w32api-3.12_binutils-2.18.ptxconfig
+++ b/ptxconfigs/mingw/i586-mingw32msvc_gcc-4.3.2_mingw-3.15.1_w32api-3.12_binutils-2.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 PTXCONF_LIBC_MINGW=y
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_MINGW_RUNTIME=y
 PTXCONF_MINGW_RUNTIME_VERSION="3.15.1"
 PTXCONF_MINGW_RUNTIME_HEADERS=y
@@ -84,7 +84,7 @@ PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}-mingw-${PTXCONF_MINGW_RUNT
 PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host"
 PTXCONF_SYSROOT_CROSS="${PTX_AUTOBUILD_DESTDIR}${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}"
 PTXCONF_SYSROOT_TARGET="${PTXCONF_SYSROOT_CROSS}/sysroot-${PTXCONF_GNU_TARGET}"
-PTXCONF_PLATFORM="${PTX_CANADIAN_CROSS}${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}"
+PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}"
 PTXCONF_COMPILER_PREFIX="${PTXCONF_GNU_TARGET}-"
 # PTXCONF_TOOLCHAIN_DEBUG is not set
 PTXCONF_CONFIGFILE_VERSION="1.99.7"
diff --git a/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig b/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
index 58f22b2..9e4cb40 100644
--- a/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
+++ b/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/newlib/arm-cortexm3-eabi_gcc-4.3.2_newlib-1.16.0_binutils-2.18.ptxconfig b/ptxconfigs/newlib/arm-cortexm3-eabi_gcc-4.3.2_newlib-1.16.0_binutils-2.18.ptxconfig
index 8b1d206..6fd1d12 100644
--- a/ptxconfigs/newlib/arm-cortexm3-eabi_gcc-4.3.2_newlib-1.16.0_binutils-2.18.ptxconfig
+++ b/ptxconfigs/newlib/arm-cortexm3-eabi_gcc-4.3.2_newlib-1.16.0_binutils-2.18.ptxconfig
@@ -30,8 +30,11 @@ PTXCONF_LIBC=y
 PTXCONF_LIBC_NEWLIB=y
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+# PTXCONF_TOOLCHAIN_ENABLE_SYSROOT is not set
+PTXCONF_TOOLCHAIN_DISABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_ENABLE_MULTILIB=y
+# PTXCONF_TOOLCHAIN_DISABLE_MULTILIB is not set
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--enable-multilib"
 PTXCONF_NEWLIB=y
 PTXCONF_NEWLIB_VERSION="1.16.0"
 PTXCONF_CROSS_BINUTILS=y
diff --git a/ptxconfigs/newlib/arm-elf_gcc-4.3.2_newlib-1.16.0_binutils-2.18.ptxconfig b/ptxconfigs/newlib/arm-elf_gcc-4.3.2_newlib-1.16.0_binutils-2.18.ptxconfig
index e287c44..d42fc26 100644
--- a/ptxconfigs/newlib/arm-elf_gcc-4.3.2_newlib-1.16.0_binutils-2.18.ptxconfig
+++ b/ptxconfigs/newlib/arm-elf_gcc-4.3.2_newlib-1.16.0_binutils-2.18.ptxconfig
@@ -30,8 +30,11 @@ PTXCONF_LIBC=y
 PTXCONF_LIBC_NEWLIB=y
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+# PTXCONF_TOOLCHAIN_ENABLE_SYSROOT is not set
+PTXCONF_TOOLCHAIN_DISABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_ENABLE_MULTILIB=y
+# PTXCONF_TOOLCHAIN_DISABLE_MULTILIB is not set
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--enable-multilib"
 PTXCONF_NEWLIB=y
 PTXCONF_NEWLIB_VERSION="1.16.0"
 PTXCONF_CROSS_BINUTILS=y
diff --git a/ptxconfigs/powerpc-603e-linux-gnu_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig b/ptxconfigs/powerpc-603e-linux-gnu_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
index d28d85c..4193b16 100644
--- a/ptxconfigs/powerpc-603e-linux-gnu_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
+++ b/ptxconfigs/powerpc-603e-linux-gnu_gcc-4.1.2_glibc-2.5_binutils-2.17_kernel-2.6.18.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
diff --git a/ptxconfigs/powerpc-603e-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig b/ptxconfigs/powerpc-603e-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
index ba292b5..ad7eb53 100644
--- a/ptxconfigs/powerpc-603e-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
+++ b/ptxconfigs/powerpc-603e-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
@@ -30,10 +30,10 @@ PTXCONF_LIBC_GLIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 # PTXCONF_LIBC_AVR is not set
-PTXCONF_GENERIC_SYSROOT=y
-PTXCONF_GENERIC_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
-PTXCONF_GENERIC_DISABLE_MULTILIB=y
-PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
+PTXCONF_TOOLCHAIN_ENABLE_SYSROOT=y
+PTXCONF_TOOLCHAIN_CONFIG_SYSROOT="--with-sysroot=${SYSROOT}"
+PTXCONF_TOOLCHAIN_DISABLE_MULTILIB=y
+PTXCONF_TOOLCHAIN_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y