* ptxconfigs/*

	regenerated


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

27 files changed, 330 insertions, 156 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 e535163..a136f9c 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.5"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG=""
+PTXCONF_GLIBC_CONFIG_EXTRA=""
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.1.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=softfp --with-fpu=vfp --with-cpu=arm1136jf-s"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=softfp --with-fpu=vfp --with-cpu=arm1136jf-s"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
index 5860d6c..674de15 100644
--- a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
+++ b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
@@ -30,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.8"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.23"
-PTXCONF_GLIBC_EXTRA_CONFIG=""
+PTXCONF_GLIBC_CONFIG_EXTRA=""
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.3.2"
 PTXCONF_CROSS_GCC_43=y
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=softfp --with-fpu=vfp --with-cpu=arm1136jf-s"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=softfp --with-fpu=vfp --with-cpu=arm1136jf-s"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_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 8f6688a..8b9039a 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.3.6"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG=""
+PTXCONF_GLIBC_CONFIG_EXTRA=""
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 PTXCONF_GLIBC_ADDON_LINUXTHREADS=y
 # PTXCONF_GLIBC_ADDON_NPTL is not set
@@ -59,7 +63,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.0.4"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=hard --with-fpu=fpa --with-arch=armv4t"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=fpa --with-arch=armv4t"
 
 #
 # Additional supported languages:
@@ -69,11 +73,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_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 71160c9..d672595 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.3.6"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES="series"
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG=""
+PTXCONF_GLIBC_CONFIG_EXTRA=""
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.0.4"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=hard --with-fpu=fpa --with-cpu=xscale"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=fpa --with-cpu=xscale"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_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 9a34661..13de4a9 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.5"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.1.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-cpu=iwmmxt"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=iwmmxt"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/arm-iwmmx-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig b/ptxconfigs/arm-iwmmx-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
index 24d9c82..ead0e08 100644
--- a/ptxconfigs/arm-iwmmx-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
+++ b/ptxconfigs/arm-iwmmx-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
@@ -30,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.8"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.23"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.3.2"
 PTXCONF_CROSS_GCC_43=y
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-cpu=iwmmxt"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=iwmmxt"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_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 609aa0e..070d892 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.3.6"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 PTXCONF_GLIBC_ADDON_LINUXTHREADS=y
 # PTXCONF_GLIBC_ADDON_NPTL is not set
@@ -59,7 +63,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.0.4"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-arch=armv4t"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-arch=armv4t"
 
 #
 # Additional supported languages:
@@ -69,11 +73,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_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 9a112f7..87d23c4 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.3.6"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 PTXCONF_GLIBC_ADDON_LINUXTHREADS=y
 # PTXCONF_GLIBC_ADDON_NPTL is not set
@@ -59,7 +63,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.0.4"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
 
 #
 # Additional supported languages:
@@ -69,11 +73,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_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 eaa341c..036079c 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.3.6"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 PTXCONF_GLIBC_ADDON_LINUXTHREADS=y
 # PTXCONF_GLIBC_ADDON_NPTL is not set
@@ -59,7 +63,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.0.4"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
 
 #
 # Additional supported languages:
@@ -69,11 +73,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_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 8cd067b..7c04660 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.5"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.1.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-arch=armv4t"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-arch=armv4t"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
index 71fd22c..d73cfa3 100644
--- a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
@@ -30,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.8"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.23"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.3.2"
 PTXCONF_CROSS_GCC_43=y
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-arch=armv4t"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-arch=armv4t"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_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 6067071..9401ea8 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.5"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.1.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-cpu=arm926ej-s --with-arch=armv5te"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=arm926ej-s --with-arch=armv5te"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
index 1782e50..13acef0 100644
--- a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
@@ -30,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.8"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.23"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.3.2"
 PTXCONF_CROSS_GCC_43=y
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-cpu=arm926ej-s --with-arch=armv5te"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=arm926ej-s --with-arch=armv5te"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_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 cd2574a..0961f0a 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.5"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.1.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/arm-xscale-linux-gnueabi_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig b/ptxconfigs/arm-xscale-linux-gnueabi_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
index 37d1ed9..80c4211 100644
--- a/ptxconfigs/arm-xscale-linux-gnueabi_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
+++ b/ptxconfigs/arm-xscale-linux-gnueabi_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
@@ -30,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.8"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.23"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.2.3"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_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 51fd995..b65b25c 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.5"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.1.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/armeb-xscale-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig b/ptxconfigs/armeb-xscale-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
index 91b2ee8..64dd367 100644
--- a/ptxconfigs/armeb-xscale-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
+++ b/ptxconfigs/armeb-xscale-linux-gnueabi_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
@@ -30,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.8"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.23"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.3.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=xscale"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/avr/avr_gcc-3.4.2_libc-1.0.5.ptxconfig b/ptxconfigs/avr/avr_gcc-3.4.2_libc-1.0.5.ptxconfig
index 54937d5..05c8e6b 100644
--- a/ptxconfigs/avr/avr_gcc-3.4.2_libc-1.0.5.ptxconfig
+++ b/ptxconfigs/avr/avr_gcc-3.4.2_libc-1.0.5.ptxconfig
@@ -30,6 +30,8 @@ PTXCONF_LIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 PTXCONF_LIBC_AVR=y
+PTXCONF_GENERIC_DISABLE_MULTILIB=y
+PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_AVRLIB=y
 PTXCONF_AVRLIB_VERSION="1.0.5"
 PTXCONF_CROSS_BINUTILS=y
@@ -38,7 +40,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="3.4.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG=""
+PTXCONF_CROSS_GCC_CONFIG_EXTRA=""
 
 #
 # Additional supported languages:
@@ -47,8 +49,18 @@ PTXCONF_CROSS_GCC_LANG_C=y
 # PTXCONF_CROSS_GCC_LANG_CXX is not set
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--disable-__cxa_atexit"
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--disable-shared"
+# PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT is not set
+PTXCONF_CROSS_GCC_DISABLE_CXA_ATEXIT=y
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--disable-__cxa_atexit"
+PTXCONF_CROSS_GCC_ENABLE_SJLJ_EXCEPTIONS=y
+# PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS is not set
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--enable-sjlj-exceptions"
+# PTXCONF_CROSS_GCC_ENABLE_LIBSSP is not set
+PTXCONF_CROSS_GCC_DISABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--disable-libssp"
+# PTXCONF_CROSS_GCC_ENABLE_SHARED is not set
+PTXCONF_CROSS_GCC_DISABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--disable-shared"
 PTXCONF_CROSS_GCC_THREADS_SINGLE=y
 PTXCONF_CROSS_GCC_THREADS="single"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/avr/avr_gcc-4.1.2_libc-1.4.6.ptxconfig b/ptxconfigs/avr/avr_gcc-4.1.2_libc-1.4.6.ptxconfig
index fa1dc7b..a403bd0 100644
--- a/ptxconfigs/avr/avr_gcc-4.1.2_libc-1.4.6.ptxconfig
+++ b/ptxconfigs/avr/avr_gcc-4.1.2_libc-1.4.6.ptxconfig
@@ -30,6 +30,8 @@ PTXCONF_LIBC=y
 # PTXCONF_LIBC_NEWLIB is not set
 # PTXCONF_LIBC_MINGW is not set
 PTXCONF_LIBC_AVR=y
+PTXCONF_GENERIC_DISABLE_MULTILIB=y
+PTXCONF_GENERIC_CONFIG_MULTILIB="--disable-multilib"
 PTXCONF_AVRLIB=y
 PTXCONF_AVRLIB_VERSION="1.4.6"
 PTXCONF_CROSS_BINUTILS=y
@@ -38,7 +40,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.1.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--disable-libssp"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA=""
 
 #
 # Additional supported languages:
@@ -47,8 +49,18 @@ PTXCONF_CROSS_GCC_LANG_C=y
 # PTXCONF_CROSS_GCC_LANG_CXX is not set
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--disable-__cxa_atexit"
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--disable-shared"
+# PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT is not set
+PTXCONF_CROSS_GCC_DISABLE_CXA_ATEXIT=y
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--disable-__cxa_atexit"
+PTXCONF_CROSS_GCC_ENABLE_SJLJ_EXCEPTIONS=y
+# PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS is not set
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--enable-sjlj-exceptions"
+# PTXCONF_CROSS_GCC_ENABLE_LIBSSP is not set
+PTXCONF_CROSS_GCC_DISABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--disable-libssp"
+# PTXCONF_CROSS_GCC_ENABLE_SHARED is not set
+PTXCONF_CROSS_GCC_DISABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--disable-shared"
 PTXCONF_CROSS_GCC_THREADS_SINGLE=y
 PTXCONF_CROSS_GCC_THREADS="single"
 PTXCONF_CROSS_GCC_FIRST=y
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 78a2876..2be62f4 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.5"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG=""
+PTXCONF_GLIBC_CONFIG_EXTRA=""
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -57,7 +61,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.1.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-arch=i586"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-arch=i586"
 
 #
 # Additional supported languages:
@@ -67,11 +71,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/i586-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig b/ptxconfigs/i586-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
index b65eb62..e01f194 100644
--- a/ptxconfigs/i586-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
+++ b/ptxconfigs/i586-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
@@ -30,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.8"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.23"
-PTXCONF_GLIBC_EXTRA_CONFIG=""
+PTXCONF_GLIBC_CONFIG_EXTRA=""
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -57,7 +61,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.3.2"
 PTXCONF_CROSS_GCC_43=y
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-arch=i586"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-arch=i586"
 
 #
 # Additional supported languages:
@@ -67,11 +71,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_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 6f4dfaa..e831b45 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.5"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG=""
+PTXCONF_GLIBC_CONFIG_EXTRA=""
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -57,7 +61,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.1.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-arch=i686"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-arch=i686"
 
 #
 # Additional supported languages:
@@ -67,11 +71,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig b/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
index 33278f0..3a3bf7f 100644
--- a/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
+++ b/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
@@ -30,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.8"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.23"
-PTXCONF_GLIBC_EXTRA_CONFIG=""
+PTXCONF_GLIBC_CONFIG_EXTRA=""
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -57,7 +61,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.3.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-arch=i686"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-arch=i686"
 
 #
 # Additional supported languages:
@@ -67,11 +71,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/java/arm-v5te-linux-gnueabi_gcc-4.3.2_java_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig b/ptxconfigs/java/arm-v5te-linux-gnueabi_gcc-4.3.2_java_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
index 02ae055..2393e22 100644
--- a/ptxconfigs/java/arm-v5te-linux-gnueabi_gcc-4.3.2_java_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
+++ b/ptxconfigs/java/arm-v5te-linux-gnueabi_gcc-4.3.2_java_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
@@ -30,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.8"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.23"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.3.2"
 PTXCONF_CROSS_GCC_43=y
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft --with-fpu=vfp --with-cpu=arm926ej-s --with-arch=armv5te"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=arm926ej-s --with-arch=armv5te"
 
 #
 # Additional supported languages:
@@ -72,11 +76,13 @@ PTXCONF_CROSS_GCC_LANG_JAVA=y
 PTXCONF_CROSS_ECJ=y
 PTXCONF_CROSS_ECJ_VERSION="4.3"
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig b/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
index 1b8e3f5..6fbe6ab 100644
--- a/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
+++ b/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-4.2.3_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
@@ -30,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.8"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.23"
-PTXCONF_GLIBC_EXTRA_CONFIG="--without-fp"
+PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp"
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-DBOOTSTRAP_GCC"
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -60,7 +64,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.2.3"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-float=soft"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft"
 
 #
 # Additional supported languages:
@@ -70,11 +74,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=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 aaaffe9..d28d85c 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,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.5"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.16"
-PTXCONF_GLIBC_EXTRA_CONFIG=""
+PTXCONF_GLIBC_CONFIG_EXTRA=""
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -57,7 +61,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.1.2"
 # PTXCONF_CROSS_GCC_43 is not set
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-cpu=603e --disable-altivec"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-cpu=603e --disable-altivec"
 
 #
 # Additional supported languages:
@@ -67,11 +71,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y
diff --git a/ptxconfigs/powerpc-603e-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig b/ptxconfigs/powerpc-603e-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
index e9b2f66..4219164 100644
--- a/ptxconfigs/powerpc-603e-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
+++ b/ptxconfigs/powerpc-603e-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.26-sanitized.ptxconfig
@@ -30,6 +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_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
@@ -38,7 +42,7 @@ PTXCONF_GLIBC_VERSION="2.8"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="2.6.23"
-PTXCONF_GLIBC_EXTRA_CONFIG=""
+PTXCONF_GLIBC_CONFIG_EXTRA=""
 PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 # PTXCONF_GLIBC_ADDON_LINUXTHREADS is not set
 PTXCONF_GLIBC_ADDON_NPTL=y
@@ -57,7 +61,7 @@ PTXCONF_CROSS_GCC=y
 PTXCONF_CROSS_GCC_VERSION="4.3.2"
 PTXCONF_CROSS_GCC_43=y
 PTXCONF_CROSS_GCC_SERIES=""
-PTXCONF_CROSS_GCC_EXTRA_CONFIG="--with-cpu=603e --disable-altivec"
+PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-cpu=603e --disable-altivec"
 
 #
 # Additional supported languages:
@@ -67,11 +71,13 @@ PTXCONF_CROSS_GCC_LANG_CXX=y
 # PTXCONF_CROSS_GCC_LANG_FORTRAN is not set
 # PTXCONF_CROSS_GCC_LANG_JAVA is not set
 PTXCONF_CROSS_GCC_ENABLE_CXA_ATEXIT=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
+PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT="--enable-__cxa_atexit"
 PTXCONF_CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
-PTXCONF_CROSS_GCC_SHARED=y
-PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED="--enable-shared"
+PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS="--disable-sjlj-exceptions"
+PTXCONF_CROSS_GCC_ENABLE_LIBSSP=y
+PTXCONF_CROSS_GCC_CONFIG_LIBSSP="--enable-libssp"
+PTXCONF_CROSS_GCC_ENABLE_SHARED=y
+PTXCONF_CROSS_GCC_CONFIG_SHARED="--enable-shared"
 PTXCONF_CROSS_GCC_THREADS_POSIX=y
 PTXCONF_CROSS_GCC_THREADS="posix"
 PTXCONF_CROSS_GCC_FIRST=y