Patchwork [RFC,3/3] gcc: Move 4.3.3 and Special kernel gcc-3.4.4 to meta-extras

login
register
mail settings
Submitter Saul Wold
Date May 15, 2011, 12:23 a.m.
Message ID <1172b1f832b1d8e2a5a44ab37f244d7e63268d09.1305418871.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/4029/
State New, archived
Headers show

Comments

Saul Wold - May 15, 2011, 12:23 a.m.
From: Saul Wold <sgw@linux.intel.com>

[YOCTO #1043]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/gcc/gcc-4.3.3.inc            |   71 -
 .../gcc/gcc-4.3.3/100-uclibc-conf.patch            |   37 -
 .../gcc/gcc-4.3.3/103-uclibc-conf-noupstream.patch |   11 -
 .../gcc/gcc-4.3.3/110-arm-eabi.patch               |   27 -
 .../gcc/gcc-4.3.3/200-uclibc-locale.patch          | 2833 ---------
 .../gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch    |  233 -
 .../gcc-4.3.3/204-uclibc-locale-wchar_fix.patch    |   48 -
 .../gcc/gcc-4.3.3/205-uclibc-locale-update.patch   |  519 --
 .../gcc/gcc-4.3.3/300-libstdc++-pic.patch          |   46 -
 .../gcc/gcc-4.3.3/301-missing-execinfo_h.patch     |   11 -
 .../gcc/gcc-4.3.3/302-c99-snprintf.patch           |   13 -
 .../gcc/gcc-4.3.3/303-c99-complex-ugly-hack.patch  |   12 -
 .../gcc/gcc-4.3.3/304-index_macro.patch            |   24 -
 .../gcc-4.3.3/305-libmudflap-susv3-legacy.patch    |   49 -
 .../gcc/gcc-4.3.3/306-libstdc++-namespace.patch    |   36 -
 .../gcc/gcc-4.3.3/307-locale_facets.patch          |   19 -
 .../gcc-4.3.3/402-libbackend_dep_gcov-iov.h.patch  |   13 -
 .../gcc/gcc-4.3.3/602-sdk-libstdc++-includes.patch |   20 -
 .../recipes-devtools/gcc/gcc-4.3.3/64bithack.patch |   33 -
 .../gcc/gcc-4.3.3/740-sh-pr24836.patch             |   25 -
 .../gcc/gcc-4.3.3/800-arm-bigendian.patch          |   34 -
 .../gcc/gcc-4.3.3/801-arm-bigendian-eabi.patch     |   14 -
 .../gcc/gcc-4.3.3/904-flatten-switch-stmt-00.patch |  153 -
 .../gcc/gcc-4.3.3/arm-nolibfloat.patch             |   24 -
 .../gcc/gcc-4.3.3/arm-softfloat.patch              |   16 -
 .../gcc/gcc-4.3.3/arm-thumb-cache.patch            |   29 -
 .../recipes-devtools/gcc/gcc-4.3.3/arm-thumb.patch |   43 -
 .../gcc/gcc-4.3.3/cache-amnesia.patch              |   31 -
 .../debian/arm-unbreak-eabi-armv4t.dpatch          |   36 -
 .../gcc/gcc-4.3.3/debian/gcc-ice-hack.dpatch       |  331 -
 .../gcc/gcc-4.3.3/debian/libstdc++-pic.dpatch      |   71 -
 .../gcc/gcc-4.3.3/debian/pr30961.dpatch            |  179 -
 .../fedora/gcc43-c++-builtin-redecl.patch          |  102 -
 .../gcc/gcc-4.3.3/fedora/gcc43-cpp-pragma.patch    |  284 -
 .../gcc/gcc-4.3.3/fedora/gcc43-i386-libgomp.patch  |   61 -
 .../gcc-4.3.3/fedora/gcc43-ia64-libunwind.patch    |  538 --
 .../fedora/gcc43-java-debug-iface-type.patch       |   17 -
 .../gcc/gcc-4.3.3/fedora/gcc43-java-nomulti.patch  |   44 -
 .../gcc-4.3.3/fedora/gcc43-libgomp-speedup.patch   | 2797 --------
 .../gcc/gcc-4.3.3/fedora/gcc43-ppc32-retaddr.patch |   86 -
 .../gcc/gcc-4.3.3/fedora/gcc43-pr27898.patch       |   16 -
 .../gcc/gcc-4.3.3/fedora/gcc43-pr32139.patch       |   19 -
 .../gcc/gcc-4.3.3/fedora/gcc43-pr33763.patch       |  153 -
 .../gcc/gcc-4.3.3/fedora/gcc43-pr35440.patch       |   56 -
 .../gcc/gcc-4.3.3/fedora/gcc43-pr35751.patch       |  114 -
 .../gcc/gcc-4.3.3/fedora/gcc43-rh251682.patch      |   89 -
 .../gcc/gcc-4.3.3/fedora/gcc43-rh330771.patch      |   34 -
 .../gcc/gcc-4.3.3/fedora/gcc43-rh341221.patch      |   28 -
 .../gcc/gcc-4.3.3/fortran-cross-compile-hack.patch |   30 -
 .../gcc/gcc-4.3.3/fortran-static-linking.patch     |   48 -
 .../gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch         |  319 -
 .../gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch   |   23 -
 .../gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch          |   31 -
 .../gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch      | 6691 --------------------
 .../gcc/gcc-4.3.3/gcc-arm-frename-registers.patch  |   25 -
 .../gcc/gcc-4.3.3/gcc-flags-for-build.patch        |  279 -
 .../gcc-release-branch/PR-36500-fix-neon.patch     |  265 -
 .../gcc/gcc-4.3.3/gcc41-configure.in.patch         |   22 -
 .../gcc/gcc-4.3.3/gcc43-build-id.patch             |   74 -
 .../gcc/gcc-4.3.3/gcc43-ppc64-ia64-GNU-stack.patch |   86 -
 meta/recipes-devtools/gcc/gcc-4.3.3/gfortran.patch |   40 -
 .../gcc/gcc-4.3.3/headerpath.patch                 |   42 -
 .../gcc/gcc-4.3.3/intermask-bigendian.patch        |   24 -
 meta/recipes-devtools/gcc/gcc-4.3.3/ldflags.patch  |   22 -
 .../gcc/gcc-4.3.3/optional_libstdc.patch           |   23 -
 meta/recipes-devtools/gcc/gcc-4.3.3/pr34130.patch  |   16 -
 meta/recipes-devtools/gcc/gcc-4.3.3/pr35942.patch  |   38 -
 .../gcc/gcc-4.3.3/sdk-libstdc++-includes.patch     |   22 -
 .../gcc/gcc-4.3.3/sh3-installfix-fixheaders.patch  |   11 -
 .../recipes-devtools/gcc/gcc-4.3.3/sh_unwind.patch |   18 -
 .../gcc/gcc-4.3.3/sparseset_rule.patch             |   20 -
 .../gcc/gcc-4.3.3/unbreak-armv4t.patch             |   12 -
 .../gcc/gcc-4.3.3/zecke-no-host-includes.patch     |   31 -
 .../gcc/gcc-4.3.3/zecke-xgcc-cpp.patch             |   28 -
 .../gcc/gcc-cross-canadian_4.3.3.bb                |   24 -
 .../gcc/gcc-cross-initial_4.3.3.bb                 |    5 -
 .../gcc/gcc-cross-intermediate_4.3.3.bb            |    4 -
 .../gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb   |   15 -
 meta/recipes-devtools/gcc/gcc-cross_4.3.3.bb       |   10 -
 .../gcc/gcc-crosssdk-initial_4.3.3.bb              |    3 -
 .../gcc/gcc-crosssdk-intermediate_4.3.3.bb         |    3 -
 meta/recipes-devtools/gcc/gcc-crosssdk_4.3.3.bb    |    3 -
 meta/recipes-devtools/gcc/gcc-runtime_4.3.3.bb     |   11 -
 meta/recipes-devtools/gcc/gcc_4.3.3.bb             |   10 -
 84 files changed, 0 insertions(+), 17807 deletions(-)
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3.inc
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/100-uclibc-conf.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/103-uclibc-conf-noupstream.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/200-uclibc-locale.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/204-uclibc-locale-wchar_fix.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/205-uclibc-locale-update.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/300-libstdc++-pic.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/301-missing-execinfo_h.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/302-c99-snprintf.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/303-c99-complex-ugly-hack.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/304-index_macro.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/305-libmudflap-susv3-legacy.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/306-libstdc++-namespace.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/307-locale_facets.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/402-libbackend_dep_gcov-iov.h.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/602-sdk-libstdc++-includes.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/64bithack.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/740-sh-pr24836.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/800-arm-bigendian.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/801-arm-bigendian-eabi.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/904-flatten-switch-stmt-00.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/arm-nolibfloat.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/arm-softfloat.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/arm-thumb-cache.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/arm-thumb.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/cache-amnesia.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/debian/arm-unbreak-eabi-armv4t.dpatch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/debian/gcc-ice-hack.dpatch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/debian/libstdc++-pic.dpatch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/debian/pr30961.dpatch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-c++-builtin-redecl.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-cpp-pragma.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-i386-libgomp.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-ia64-libunwind.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-java-debug-iface-type.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-java-nomulti.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-libgomp-speedup.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-ppc32-retaddr.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr27898.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr32139.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr33763.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr35440.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr35751.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh251682.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh330771.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh341221.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fortran-cross-compile-hack.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/fortran-static-linking.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/gcc-arm-frename-registers.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/gcc-flags-for-build.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/gcc-release-branch/PR-36500-fix-neon.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/gcc41-configure.in.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/gcc43-build-id.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/gcc43-ppc64-ia64-GNU-stack.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/gfortran.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/headerpath.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/intermask-bigendian.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/ldflags.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/optional_libstdc.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/pr34130.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/pr35942.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/sdk-libstdc++-includes.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/sh3-installfix-fixheaders.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/sh_unwind.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/sparseset_rule.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/unbreak-armv4t.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/zecke-no-host-includes.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-canadian_4.3.3.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-initial_4.3.3.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-intermediate_4.3.3.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross_4.3.3.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.3.3.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.3.3.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk_4.3.3.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-runtime_4.3.3.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc_4.3.3.bb

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3.inc b/meta/recipes-devtools/gcc/gcc-4.3.3.inc
deleted file mode 100644
index 55d66f5..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3.inc
+++ /dev/null
@@ -1,71 +0,0 @@ 
-require gcc-common.inc
-LICENSE = "GPLv3"
-
-DEPENDS =+ "mpfr gmp"
-NATIVEDEPS = "mpfr-native gmp-native gettext-native"
-
-SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-ppc32-retaddr.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr27898.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr32139.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr33763.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh330771.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh341221.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-cpp-pragma.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-java-debug-iface-type.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-libgomp-speedup.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-i386-libgomp.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh251682.patch;patch=1;pnum=0 \
-	file://debian/arm-unbreak-eabi-armv4t.dpatch;patch=1 \
-	file://debian/libstdc++-pic.dpatch;patch=1;pnum=0 \
-	file://debian/gcc-ice-hack.dpatch;patch=1;pnum=0 \ 
-	file://debian/pr30961.dpatch;patch=1;pnum=0 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://103-uclibc-conf-noupstream.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://203-uclibc-locale-no__x.patch;patch=1 \
-	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-	file://205-uclibc-locale-update.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://305-libmudflap-susv3-legacy.patch;patch=1 \
-	file://306-libstdc++-namespace.patch;patch=1 \
-	file://307-locale_facets.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://904-flatten-switch-stmt-00.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-	file://gcc-arm-frename-registers.patch;patch=1 \
-	file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
-	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://gcc-flags-for-build.patch;patch=1 \
-	file://pr35942.patch;patch=1 \
-	file://optional_libstdc.patch;patch=1 \
-	file://sparseset_rule.patch;patch=1 \
-	file://64bithack.patch;patch=1 \
-"
-
-#	file://gfortran.patch;patch=1
-#	file://pr34130.patch;patch=1
-#	file://fortran-static-linking.patch;patch=1
-
-
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
-
-# Language Overrides
-FORTRAN = ""
-JAVA = ""
-
-EXTRA_OECONF_BASE = "  --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
-EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
-EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/100-uclibc-conf.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/100-uclibc-conf.patch
deleted file mode 100644
index 0b79960..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/100-uclibc-conf.patch
+++ /dev/null
@@ -1,37 +0,0 @@ 
-Index: gcc-4.3.1/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.3.1.orig/contrib/regression/objs-gcc.sh	2007-12-24 15:18:57.000000000 -0800
-+++ gcc-4.3.1/contrib/regression/objs-gcc.sh	2008-08-16 01:15:12.000000000 -0700
-@@ -105,6 +105,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
-Index: gcc-4.3.1/libjava/classpath/ltconfig
-===================================================================
---- gcc-4.3.1.orig/libjava/classpath/ltconfig	2007-06-03 16:18:43.000000000 -0700
-+++ gcc-4.3.1/libjava/classpath/ltconfig	2008-08-16 01:15:12.000000000 -0700
-@@ -603,7 +603,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1251,7 +1251,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/103-uclibc-conf-noupstream.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/103-uclibc-conf-noupstream.patch
deleted file mode 100644
index 09c9bbe..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/103-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,11 +0,0 @@ 
---- gcc/gcc/config.gcc.uclibc100-sh~	2006-03-06 20:46:56 +0100
-+++ gcc/gcc/config.gcc	2006-03-10 15:02:41 +0100
-@@ -1905,7 +1905,7 @@
- 	;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
--  sh-*-linux* | sh[346lbe]*-*-linux* | \
-+  sh*-*-linux* | sh[346lbe]*-*-linux* | \
-   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
-    sh64-*-netbsd* | sh64l*-*-netbsd*)
- 	tmake_file="${tmake_file} sh/t-sh sh/t-elf"
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch
deleted file mode 100644
index 74e4a5a..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch
+++ /dev/null
@@ -1,27 +0,0 @@ 
---- gcc-2005q3-1.orig/gcc/config.gcc	2005-10-31 19:02:54.000000000 +0300
-+++ gcc-2005q3-1/gcc/config.gcc	2006-01-27 01:09:09.000000000 +0300
-@@ -674,7 +674,7 @@
- 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h" 
- 	tmake_file="t-slibgcc-elf-ver t-linux arm/t-arm"
- 	case ${target} in
--	arm*-*-linux-gnueabi)
-+	arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi)
- 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
- 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
-   	    # The BPABI long long divmod functions return a 128-bit value in 
-
-diff -urN gcc-2005q3-2/gcc/config/arm/linux-eabi.h gcc-2005q3-2.new/gcc/config/arm/linux-eabi.h
---- gcc-2005q3-2/gcc/config/arm/linux-eabi.h	2005-12-07 23:14:16.000000000 +0300
-+++ gcc-2005q3-2.new/gcc/config/arm/linux-eabi.h	2006-03-29 19:02:34.000000000 +0400
-@@ -53,7 +53,11 @@
- /* Use ld-linux.so.3 so that it will be possible to run "classic"
-    GNU/Linux binaries on an EABI system.  */
- #undef LINUX_TARGET_INTERPRETER
-+#ifdef USE_UCLIBC
-+#define LINUX_TARGET_INTERPRETER "/lib/ld-uClibc.so.0"
-+#else
- #define LINUX_TARGET_INTERPRETER "/lib/ld-linux.so.3"
-+#endif
- 
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/200-uclibc-locale.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/200-uclibc-locale.patch
deleted file mode 100644
index 70ba98e..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/200-uclibc-locale.patch
+++ /dev/null
@@ -1,2833 +0,0 @@ 
-Index: gcc-4.3.2/libstdc++-v3/acinclude.m4
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/acinclude.m4	2008-04-25 09:52:57.000000000 -0700
-+++ gcc-4.3.2/libstdc++-v3/acinclude.m4	2008-08-28 17:55:56.000000000 -0700
-@@ -1349,7 +1349,7 @@
- AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
-   GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
-     [use MODEL for target locale package],
--    [permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
-+    [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto])
- 
-   # Deal with gettext issues.  Default to not using it (=no) until we detect
-   # support for it later.  Let the user turn it off via --e/d, but let that
-@@ -1370,6 +1370,9 @@
-   # Default to "generic".
-   if test $enable_clocale_flag = auto; then
-     case ${target_os} in
-+      *-uclibc*)
-+        enable_clocale_flag=uclibc
-+        ;;
-       linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
-         enable_clocale_flag=gnu	
-         ;;
-@@ -1541,6 +1544,40 @@
-       CTIME_CC=config/locale/generic/time_members.cc
-       CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
-       ;;
-+    uclibc)
-+      AC_MSG_RESULT(uclibc)
-+
-+      # Declare intention to use gettext, and add support for specific
-+      # languages.
-+      # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+      ALL_LINGUAS="de fr"
-+
-+      # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+      AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
-+      if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+        USE_NLS=yes
-+      fi
-+      # Export the build objects.
-+      for ling in $ALL_LINGUAS; do \
-+        glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+        glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+      done
-+      AC_SUBST(glibcxx_MOFILES)
-+      AC_SUBST(glibcxx_POFILES)
-+
-+      CLOCALE_H=config/locale/uclibc/c_locale.h
-+      CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+      CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+      CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+      CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+      CMESSAGES_H=config/locale/uclibc/messages_members.h
-+      CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+      CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+      CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+      CTIME_H=config/locale/uclibc/time_members.h
-+      CTIME_CC=config/locale/uclibc/time_members.cc
-+      CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+      ;;
-   esac
- 
-   # This is where the testsuite looks for locale catalogs, using the
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	2008-08-28 17:55:56.000000000 -0700
-@@ -0,0 +1,63 @@
-+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
-+
-+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+// Written by Jakub Jelinek <jakub@redhat.com>
-+
-+#include <bits/c++config.h>
-+#include <clocale>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning clean this up
-+#endif
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+
-+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
-+extern "C" __typeof(strcoll_l) __strcoll_l;
-+extern "C" __typeof(strftime_l) __strftime_l;
-+extern "C" __typeof(strtod_l) __strtod_l;
-+extern "C" __typeof(strtof_l) __strtof_l;
-+extern "C" __typeof(strtold_l) __strtold_l;
-+extern "C" __typeof(strxfrm_l) __strxfrm_l;
-+extern "C" __typeof(newlocale) __newlocale;
-+extern "C" __typeof(freelocale) __freelocale;
-+extern "C" __typeof(duplocale) __duplocale;
-+extern "C" __typeof(uselocale) __uselocale;
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+extern "C" __typeof(iswctype_l) __iswctype_l;
-+extern "C" __typeof(towlower_l) __towlower_l;
-+extern "C" __typeof(towupper_l) __towupper_l;
-+extern "C" __typeof(wcscoll_l) __wcscoll_l;
-+extern "C" __typeof(wcsftime_l) __wcsftime_l;
-+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
-+extern "C" __typeof(wctype_l) __wctype_l;
-+#endif
-+
-+#endif // GLIBC 2.3 and later
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc	2008-08-28 17:55:56.000000000 -0700
-@@ -0,0 +1,160 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.8  Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <cerrno>  // For errno
-+#include <locale>
-+#include <stdexcept>
-+#include <langinfo.h>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strtol_l(S, E, B, L)      strtol((S), (E), (B))
-+#define __strtoul_l(S, E, B, L)     strtoul((S), (E), (B))
-+#define __strtoll_l(S, E, B, L)     strtoll((S), (E), (B))
-+#define __strtoull_l(S, E, B, L)    strtoull((S), (E), (B))
-+#define __strtof_l(S, E, L)         strtof((S), (E))
-+#define __strtod_l(S, E, L)         strtod((S), (E))
-+#define __strtold_l(S, E, L)        strtold((S), (E))
-+#warning should dummy __newlocale check for C|POSIX ?
-+#define __newlocale(a, b, c)        NULL
-+#define __freelocale(a)             ((void)0)
-+#define __duplocale(a)              __c_locale()
-+#endif
-+
-+namespace std
-+{
-+  template<>
-+    void
-+    __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
-+		   const __c_locale& __cloc)
-+    {
-+      if (!(__err & ios_base::failbit))
-+	{
-+	  char* __sanity;
-+	  errno = 0;
-+	  float __f = __strtof_l(__s, &__sanity, __cloc);
-+          if (__sanity != __s && errno != ERANGE)
-+	    __v = __f;
-+	  else
-+	    __err |= ios_base::failbit;
-+	}
-+    }
-+
-+  template<>
-+    void
-+    __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
-+		   const __c_locale& __cloc)
-+    {
-+      if (!(__err & ios_base::failbit))
-+	{
-+	  char* __sanity;
-+	  errno = 0;
-+	  double __d = __strtod_l(__s, &__sanity, __cloc);
-+          if (__sanity != __s && errno != ERANGE)
-+	    __v = __d;
-+	  else
-+	    __err |= ios_base::failbit;
-+	}
-+    }
-+
-+  template<>
-+    void
-+    __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
-+		   const __c_locale& __cloc)
-+    {
-+      if (!(__err & ios_base::failbit))
-+	{
-+	  char* __sanity;
-+	  errno = 0;
-+	  long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+          if (__sanity != __s && errno != ERANGE)
-+	    __v = __ld;
-+	  else
-+	    __err |= ios_base::failbit;
-+	}
-+    }
-+
-+  void
-+  locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
-+				    __c_locale __old)
-+  {
-+    __cloc = __newlocale(1 << LC_ALL, __s, __old);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    if (!__cloc)
-+      {
-+	// This named locale is not supported by the underlying OS.
-+	__throw_runtime_error(__N("locale::facet::_S_create_c_locale "
-+			      "name not valid"));
-+      }
-+#endif
-+  }
-+
-+  void
-+  locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
-+  {
-+    if (_S_get_c_locale() != __cloc)
-+      __freelocale(__cloc);
-+  }
-+
-+  __c_locale
-+  locale::facet::_S_clone_c_locale(__c_locale& __cloc)
-+  { return __duplocale(__cloc); }
-+} // namespace std
-+
-+namespace __gnu_cxx
-+{
-+  const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
-+    {
-+      "LC_CTYPE",
-+      "LC_NUMERIC",
-+      "LC_TIME",
-+      "LC_COLLATE",
-+      "LC_MONETARY",
-+      "LC_MESSAGES",
-+#if _GLIBCXX_NUM_CATEGORIES != 0
-+      "LC_PAPER",
-+      "LC_NAME",
-+      "LC_ADDRESS",
-+      "LC_TELEPHONE",
-+      "LC_MEASUREMENT",
-+      "LC_IDENTIFICATION"
-+#endif
-+    };
-+}
-+
-+namespace std
-+{
-+  const char* const* const locale::_S_categories = __gnu_cxx::category_names;
-+}  // namespace std
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h	2008-08-28 17:55:56.000000000 -0700
-@@ -0,0 +1,117 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.8  Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifndef _C_LOCALE_H
-+#define _C_LOCALE_H 1
-+
-+#pragma GCC system_header
-+
-+#include <cstring>              // get std::strlen
-+#include <cstdio>               // get std::snprintf or std::sprintf
-+#include <clocale>
-+#include <langinfo.h>		// For codecvt
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this
-+#endif
-+#ifdef __UCLIBC_HAS_LOCALE__
-+#include <iconv.h>		// For codecvt using iconv, iconv_t
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#include <libintl.h> 		// For messages
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning what is _GLIBCXX_C_LOCALE_GNU for
-+#endif
-+#define _GLIBCXX_C_LOCALE_GNU 1
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix categories
-+#endif
-+// #define _GLIBCXX_NUM_CATEGORIES 6
-+#define _GLIBCXX_NUM_CATEGORIES 0
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+namespace __gnu_cxx
-+{
-+  extern "C" __typeof(uselocale) __uselocale;
-+}
-+#endif
-+
-+namespace std
-+{
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+  typedef __locale_t		__c_locale;
-+#else
-+  typedef int*			__c_locale;
-+#endif
-+
-+  // Convert numeric value of type _Tv to string and return length of
-+  // string.  If snprintf is available use it, otherwise fall back to
-+  // the unsafe sprintf which, in general, can be dangerous and should
-+  // be avoided.
-+  template<typename _Tv>
-+    int
-+    __convert_from_v(char* __out,
-+		     const int __size __attribute__ ((__unused__)),
-+		     const char* __fmt,
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+		     _Tv __v, const __c_locale& __cloc, int __prec)
-+    {
-+      __c_locale __old = __gnu_cxx::__uselocale(__cloc);
-+#else
-+		     _Tv __v, const __c_locale&, int __prec)
-+    {
-+# ifdef __UCLIBC_HAS_LOCALE__
-+      char* __old = std::setlocale(LC_ALL, NULL);
-+      char* __sav = new char[std::strlen(__old) + 1];
-+      std::strcpy(__sav, __old);
-+      std::setlocale(LC_ALL, "C");
-+# endif
-+#endif
-+
-+      const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+      __gnu_cxx::__uselocale(__old);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+      std::setlocale(LC_ALL, __sav);
-+      delete [] __sav;
-+#endif
-+      return __ret;
-+    }
-+}
-+
-+#endif
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc	2008-08-28 17:55:56.000000000 -0700
-@@ -0,0 +1,308 @@
-+// std::codecvt implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <cstdlib>  // For MB_CUR_MAX
-+#include <climits>  // For MB_LEN_MAX
-+#include <bits/c++locale_internal.h>
-+
-+namespace std
-+{
-+  // Specializations.
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  codecvt_base::result
-+  codecvt<wchar_t, char, mbstate_t>::
-+  do_out(state_type& __state, const intern_type* __from,
-+	 const intern_type* __from_end, const intern_type*& __from_next,
-+	 extern_type* __to, extern_type* __to_end,
-+	 extern_type*& __to_next) const
-+  {
-+    result __ret = ok;
-+    state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+    // wcsnrtombs is *very* fast but stops if encounters NUL characters:
-+    // in case we fall back to wcrtomb and then continue, in a loop.
-+    // NB: wcsnrtombs is a GNU extension
-+    for (__from_next = __from, __to_next = __to;
-+	 __from_next < __from_end && __to_next < __to_end
-+	 && __ret == ok;)
-+      {
-+	const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
-+						      __from_end - __from_next);
-+	if (!__from_chunk_end)
-+	  __from_chunk_end = __from_end;
-+
-+	__from = __from_next;
-+	const size_t __conv = wcsnrtombs(__to_next, &__from_next,
-+					 __from_chunk_end - __from_next,
-+					 __to_end - __to_next, &__state);
-+	if (__conv == static_cast<size_t>(-1))
-+	  {
-+	    // In case of error, in order to stop at the exact place we
-+	    // have to start again from the beginning with a series of
-+	    // wcrtomb.
-+	    for (; __from < __from_next; ++__from)
-+	      __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
-+	    __state = __tmp_state;
-+	    __ret = error;
-+	  }
-+	else if (__from_next && __from_next < __from_chunk_end)
-+	  {
-+	    __to_next += __conv;
-+	    __ret = partial;
-+	  }
-+	else
-+	  {
-+	    __from_next = __from_chunk_end;
-+	    __to_next += __conv;
-+	  }
-+
-+	if (__from_next < __from_end && __ret == ok)
-+	  {
-+	    extern_type __buf[MB_LEN_MAX];
-+	    __tmp_state = __state;
-+	    const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state);
-+	    if (__conv > static_cast<size_t>(__to_end - __to_next))
-+	      __ret = partial;
-+	    else
-+	      {
-+		memcpy(__to_next, __buf, __conv);
-+		__state = __tmp_state;
-+		__to_next += __conv;
-+		++__from_next;
-+	      }
-+	  }
-+      }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+
-+    return __ret;
-+  }
-+
-+  codecvt_base::result
-+  codecvt<wchar_t, char, mbstate_t>::
-+  do_in(state_type& __state, const extern_type* __from,
-+	const extern_type* __from_end, const extern_type*& __from_next,
-+	intern_type* __to, intern_type* __to_end,
-+	intern_type*& __to_next) const
-+  {
-+    result __ret = ok;
-+    state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+    // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+    // in case we store a L'\0' and then continue, in a loop.
-+    // NB: mbsnrtowcs is a GNU extension
-+    for (__from_next = __from, __to_next = __to;
-+	 __from_next < __from_end && __to_next < __to_end
-+	 && __ret == ok;)
-+      {
-+	const extern_type* __from_chunk_end;
-+	__from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
-+								  __from_end
-+								  - __from_next));
-+	if (!__from_chunk_end)
-+	  __from_chunk_end = __from_end;
-+
-+	__from = __from_next;
-+	size_t __conv = mbsnrtowcs(__to_next, &__from_next,
-+				   __from_chunk_end - __from_next,
-+				   __to_end - __to_next, &__state);
-+	if (__conv == static_cast<size_t>(-1))
-+	  {
-+	    // In case of error, in order to stop at the exact place we
-+	    // have to start again from the beginning with a series of
-+	    // mbrtowc.
-+	    for (;; ++__to_next, __from += __conv)
-+	      {
-+		__conv = mbrtowc(__to_next, __from, __from_end - __from,
-+				 &__tmp_state);
-+		if (__conv == static_cast<size_t>(-1)
-+		    || __conv == static_cast<size_t>(-2))
-+		  break;
-+	      }
-+	    __from_next = __from;
-+	    __state = __tmp_state;
-+	    __ret = error;
-+	  }
-+	else if (__from_next && __from_next < __from_chunk_end)
-+	  {
-+	    // It is unclear what to return in this case (see DR 382).
-+	    __to_next += __conv;
-+	    __ret = partial;
-+	  }
-+	else
-+	  {
-+	    __from_next = __from_chunk_end;
-+	    __to_next += __conv;
-+	  }
-+
-+	if (__from_next < __from_end && __ret == ok)
-+	  {
-+	    if (__to_next < __to_end)
-+	      {
-+		// XXX Probably wrong for stateful encodings
-+		__tmp_state = __state;
-+		++__from_next;
-+		*__to_next++ = L'\0';
-+	      }
-+	    else
-+	      __ret = partial;
-+	  }
-+      }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+
-+    return __ret;
-+  }
-+
-+  int
-+  codecvt<wchar_t, char, mbstate_t>::
-+  do_encoding() const throw()
-+  {
-+    // XXX This implementation assumes that the encoding is
-+    // stateless and is either single-byte or variable-width.
-+    int __ret = 0;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+    if (MB_CUR_MAX == 1)
-+      __ret = 1;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+    return __ret;
-+  }
-+
-+  int
-+  codecvt<wchar_t, char, mbstate_t>::
-+  do_max_length() const throw()
-+  {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+    // XXX Probably wrong for stateful encodings.
-+    int __ret = MB_CUR_MAX;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+    return __ret;
-+  }
-+
-+  int
-+  codecvt<wchar_t, char, mbstate_t>::
-+  do_length(state_type& __state, const extern_type* __from,
-+	    const extern_type* __end, size_t __max) const
-+  {
-+    int __ret = 0;
-+    state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+    // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+    // in case we advance past it and then continue, in a loop.
-+    // NB: mbsnrtowcs is a GNU extension
-+
-+    // A dummy internal buffer is needed in order for mbsnrtocws to consider
-+    // its fourth parameter (it wouldn't with NULL as first parameter).
-+    wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
-+							   * __max));
-+    while (__from < __end && __max)
-+      {
-+	const extern_type* __from_chunk_end;
-+	__from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
-+								  __end
-+								  - __from));
-+	if (!__from_chunk_end)
-+	  __from_chunk_end = __end;
-+
-+	const extern_type* __tmp_from = __from;
-+	size_t __conv = mbsnrtowcs(__to, &__from,
-+				   __from_chunk_end - __from,
-+				   __max, &__state);
-+	if (__conv == static_cast<size_t>(-1))
-+	  {
-+	    // In case of error, in order to stop at the exact place we
-+	    // have to start again from the beginning with a series of
-+	    // mbrtowc.
-+	    for (__from = __tmp_from;; __from += __conv)
-+	      {
-+		__conv = mbrtowc(NULL, __from, __end - __from,
-+				 &__tmp_state);
-+		if (__conv == static_cast<size_t>(-1)
-+		    || __conv == static_cast<size_t>(-2))
-+		  break;
-+	      }
-+	    __state = __tmp_state;
-+	    __ret += __from - __tmp_from;
-+	    break;
-+	  }
-+	if (!__from)
-+	  __from = __from_chunk_end;
-+
-+	__ret += __from - __tmp_from;
-+	__max -= __conv;
-+
-+	if (__from < __end && __max)
-+	  {
-+	    // XXX Probably wrong for stateful encodings
-+	    __tmp_state = __state;
-+	    ++__from;
-+	    ++__ret;
-+	    --__max;
-+	  }
-+      }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+
-+    return __ret;
-+  }
-+#endif
-+}
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/collate_members.cc
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/collate_members.cc	2008-08-28 17:55:56.000000000 -0700
-@@ -0,0 +1,80 @@
-+// std::collate implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.4.1.2  collate virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strcoll_l(S1, S2, L)      strcoll((S1), (S2))
-+#define __strxfrm_l(S1, S2, N, L)   strxfrm((S1), (S2), (N))
-+#define __wcscoll_l(S1, S2, L)      wcscoll((S1), (S2))
-+#define __wcsxfrm_l(S1, S2, N, L)   wcsxfrm((S1), (S2), (N))
-+#endif
-+
-+namespace std
-+{
-+  // These are basically extensions to char_traits, and perhaps should
-+  // be put there instead of here.
-+  template<>
-+    int
-+    collate<char>::_M_compare(const char* __one, const char* __two) const
-+    {
-+      int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
-+      return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+    }
-+
-+  template<>
-+    size_t
-+    collate<char>::_M_transform(char* __to, const char* __from,
-+				size_t __n) const
-+    { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  template<>
-+    int
-+    collate<wchar_t>::_M_compare(const wchar_t* __one,
-+				 const wchar_t* __two) const
-+    {
-+      int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
-+      return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+    }
-+
-+  template<>
-+    size_t
-+    collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
-+				   size_t __n) const
-+    { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+#endif
-+}
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2008-08-28 17:55:56.000000000 -0700
-@@ -0,0 +1,300 @@
-+// std::ctype implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.1.1.2  ctype virtual functions.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __wctype_l(S, L)           wctype((S))
-+#define __towupper_l(C, L)         towupper((C))
-+#define __towlower_l(C, L)         towlower((C))
-+#define __iswctype_l(C, M, L)      iswctype((C), (M))
-+#endif
-+
-+namespace std
-+{
-+  // NB: The other ctype<char> specializations are in src/locale.cc and
-+  // various /config/os/* files.
-+  template<>
-+    ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
-+    : ctype<char>(0, false, __refs)
-+    {
-+      if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+	{
-+	  this->_S_destroy_c_locale(this->_M_c_locale_ctype);
-+	  this->_S_create_c_locale(this->_M_c_locale_ctype, __s);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	  this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
-+	  this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
-+	  this->_M_table = this->_M_c_locale_ctype->__ctype_b;
-+#endif
-+	}
-+    }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  ctype<wchar_t>::__wmask_type
-+  ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
-+  {
-+    __wmask_type __ret;
-+    switch (__m)
-+      {
-+      case space:
-+	__ret = __wctype_l("space", _M_c_locale_ctype);
-+	break;
-+      case print:
-+	__ret = __wctype_l("print", _M_c_locale_ctype);
-+	break;
-+      case cntrl:
-+	__ret = __wctype_l("cntrl", _M_c_locale_ctype);
-+	break;
-+      case upper:
-+	__ret = __wctype_l("upper", _M_c_locale_ctype);
-+	break;
-+      case lower:
-+	__ret = __wctype_l("lower", _M_c_locale_ctype);
-+	break;
-+      case alpha:
-+	__ret = __wctype_l("alpha", _M_c_locale_ctype);
-+	break;
-+      case digit:
-+	__ret = __wctype_l("digit", _M_c_locale_ctype);
-+	break;
-+      case punct:
-+	__ret = __wctype_l("punct", _M_c_locale_ctype);
-+	break;
-+      case xdigit:
-+	__ret = __wctype_l("xdigit", _M_c_locale_ctype);
-+	break;
-+      case alnum:
-+	__ret = __wctype_l("alnum", _M_c_locale_ctype);
-+	break;
-+      case graph:
-+	__ret = __wctype_l("graph", _M_c_locale_ctype);
-+	break;
-+      default:
-+	__ret = __wmask_type();
-+      }
-+    return __ret;
-+  }
-+
-+  wchar_t
-+  ctype<wchar_t>::do_toupper(wchar_t __c) const
-+  { return __towupper_l(__c, _M_c_locale_ctype); }
-+
-+  const wchar_t*
-+  ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
-+  {
-+    while (__lo < __hi)
-+      {
-+        *__lo = __towupper_l(*__lo, _M_c_locale_ctype);
-+        ++__lo;
-+      }
-+    return __hi;
-+  }
-+
-+  wchar_t
-+  ctype<wchar_t>::do_tolower(wchar_t __c) const
-+  { return __towlower_l(__c, _M_c_locale_ctype); }
-+
-+  const wchar_t*
-+  ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
-+  {
-+    while (__lo < __hi)
-+      {
-+        *__lo = __towlower_l(*__lo, _M_c_locale_ctype);
-+        ++__lo;
-+      }
-+    return __hi;
-+  }
-+
-+  bool
-+  ctype<wchar_t>::
-+  do_is(mask __m, wchar_t __c) const
-+  {
-+    // Highest bitmask in ctype_base == 10, but extra in "C"
-+    // library for blank.
-+    bool __ret = false;
-+    const size_t __bitmasksize = 11;
-+    for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+      if (__m & _M_bit[__bitcur]
-+	  && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+	{
-+	  __ret = true;
-+	  break;
-+	}
-+    return __ret;
-+  }
-+
-+  const wchar_t*
-+  ctype<wchar_t>::
-+  do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
-+  {
-+    for (; __lo < __hi; ++__vec, ++__lo)
-+      {
-+	// Highest bitmask in ctype_base == 10, but extra in "C"
-+	// library for blank.
-+	const size_t __bitmasksize = 11;
-+	mask __m = 0;
-+	for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+	  if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
-+	    __m |= _M_bit[__bitcur];
-+	*__vec = __m;
-+      }
-+    return __hi;
-+  }
-+
-+  const wchar_t*
-+  ctype<wchar_t>::
-+  do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
-+  {
-+    while (__lo < __hi && !this->do_is(__m, *__lo))
-+      ++__lo;
-+    return __lo;
-+  }
-+
-+  const wchar_t*
-+  ctype<wchar_t>::
-+  do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
-+  {
-+    while (__lo < __hi && this->do_is(__m, *__lo) != 0)
-+      ++__lo;
-+    return __lo;
-+  }
-+
-+  wchar_t
-+  ctype<wchar_t>::
-+  do_widen(char __c) const
-+  { return _M_widen[static_cast<unsigned char>(__c)]; }
-+
-+  const char*
-+  ctype<wchar_t>::
-+  do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
-+  {
-+    while (__lo < __hi)
-+      {
-+	*__dest = _M_widen[static_cast<unsigned char>(*__lo)];
-+	++__lo;
-+	++__dest;
-+      }
-+    return __hi;
-+  }
-+
-+  char
-+  ctype<wchar_t>::
-+  do_narrow(wchar_t __wc, char __dfault) const
-+  {
-+    if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
-+      return _M_narrow[__wc];
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+    const int __c = wctob(__wc);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+    return (__c == EOF ? __dfault : static_cast<char>(__c));
-+  }
-+
-+  const wchar_t*
-+  ctype<wchar_t>::
-+  do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
-+	    char* __dest) const
-+  {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+    if (_M_narrow_ok)
-+      while (__lo < __hi)
-+	{
-+	  if (*__lo >= 0 && *__lo < 128)
-+	    *__dest = _M_narrow[*__lo];
-+	  else
-+	    {
-+	      const int __c = wctob(*__lo);
-+	      *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+	    }
-+	  ++__lo;
-+	  ++__dest;
-+	}
-+    else
-+      while (__lo < __hi)
-+	{
-+	  const int __c = wctob(*__lo);
-+	  *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+	  ++__lo;
-+	  ++__dest;
-+	}
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+    return __hi;
-+  }
-+
-+  void
-+  ctype<wchar_t>::_M_initialize_ctype()
-+  {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+    wint_t __i;
-+    for (__i = 0; __i < 128; ++__i)
-+      {
-+	const int __c = wctob(__i);
-+	if (__c == EOF)
-+	  break;
-+	else
-+	  _M_narrow[__i] = static_cast<char>(__c);
-+      }
-+    if (__i == 128)
-+      _M_narrow_ok = true;
-+    else
-+      _M_narrow_ok = false;
-+    for (size_t __j = 0;
-+	 __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
-+      _M_widen[__j] = btowc(__j);
-+
-+    for (size_t __k = 0; __k <= 11; ++__k)
-+      {
-+	_M_bit[__k] = static_cast<mask>(_ISbit(__k));
-+	_M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
-+      }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+  }
-+#endif //  _GLIBCXX_USE_WCHAR_T
-+}
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.cc
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.cc	2008-08-28 17:55:56.000000000 -0700
-@@ -0,0 +1,100 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2  messages virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix gettext stuff
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__dcgettext(const char *domainname,
-+			     const char *msgid, int category);
-+#undef gettext
-+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#else
-+#undef gettext
-+#define gettext(msgid) (msgid)
-+#endif
-+
-+namespace std
-+{
-+  // Specializations.
-+  template<>
-+    string
-+    messages<char>::do_get(catalog, int, int, const string& __dfault) const
-+    {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+      __c_locale __old = __uselocale(_M_c_locale_messages);
-+      const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
-+      __uselocale(__old);
-+      return string(__msg);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+      char* __old = strdup(setlocale(LC_ALL, NULL));
-+      setlocale(LC_ALL, _M_name_messages);
-+      const char* __msg = gettext(__dfault.c_str());
-+      setlocale(LC_ALL, __old);
-+      free(__old);
-+      return string(__msg);
-+#else
-+      const char* __msg = gettext(__dfault.c_str());
-+      return string(__msg);
-+#endif
-+    }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  template<>
-+    wstring
-+    messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
-+    {
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+      __c_locale __old = __uselocale(_M_c_locale_messages);
-+      char* __msg = gettext(_M_convert_to_char(__dfault));
-+      __uselocale(__old);
-+      return _M_convert_from_char(__msg);
-+# elif defined __UCLIBC_HAS_LOCALE__
-+      char* __old = strdup(setlocale(LC_ALL, NULL));
-+      setlocale(LC_ALL, _M_name_messages);
-+      char* __msg = gettext(_M_convert_to_char(__dfault));
-+      setlocale(LC_ALL, __old);
-+      free(__old);
-+      return _M_convert_from_char(__msg);
-+# else
-+      char* __msg = gettext(_M_convert_to_char(__dfault));
-+      return _M_convert_from_char(__msg);
-+# endif
-+    }
-+#endif
-+}
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h	2008-08-28 17:55:56.000000000 -0700
-@@ -0,0 +1,118 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2  messages functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix prototypes for *textdomain funcs
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__textdomain(const char *domainname);
-+extern "C" char *__bindtextdomain(const char *domainname,
-+				  const char *dirname);
-+#else
-+#undef __textdomain
-+#undef __bindtextdomain
-+#define __textdomain(D)           ((void)0)
-+#define __bindtextdomain(D,P)     ((void)0)
-+#endif
-+
-+  // Non-virtual member functions.
-+  template<typename _CharT>
-+     messages<_CharT>::messages(size_t __refs)
-+     : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-+     _M_name_messages(_S_get_c_name())
-+     { }
-+
-+  template<typename _CharT>
-+     messages<_CharT>::messages(__c_locale __cloc, const char* __s,
-+				size_t __refs)
-+     : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
-+     _M_name_messages(__s)
-+     {
-+       char* __tmp = new char[std::strlen(__s) + 1];
-+       std::strcpy(__tmp, __s);
-+       _M_name_messages = __tmp;
-+     }
-+
-+  template<typename _CharT>
-+    typename messages<_CharT>::catalog
-+    messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
-+			   const char* __dir) const
-+    {
-+      __bindtextdomain(__s.c_str(), __dir);
-+      return this->do_open(__s, __loc);
-+    }
-+
-+  // Virtual member functions.
-+  template<typename _CharT>
-+    messages<_CharT>::~messages()
-+    {
-+      if (_M_name_messages != _S_get_c_name())
-+	delete [] _M_name_messages;
-+      _S_destroy_c_locale(_M_c_locale_messages);
-+    }
-+
-+  template<typename _CharT>
-+    typename messages<_CharT>::catalog
-+    messages<_CharT>::do_open(const basic_string<char>& __s,
-+			      const locale&) const
-+    {
-+      // No error checking is done, assume the catalog exists and can
-+      // be used.
-+      __textdomain(__s.c_str());
-+      return 0;
-+    }
-+
-+  template<typename _CharT>
-+    void
-+    messages<_CharT>::do_close(catalog) const
-+    { }
-+
-+   // messages_byname
-+   template<typename _CharT>
-+     messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
-+     : messages<_CharT>(__refs)
-+     {
-+       if (this->_M_name_messages != locale::facet::_S_get_c_name())
-+	 delete [] this->_M_name_messages;
-+       char* __tmp = new char[std::strlen(__s) + 1];
-+       std::strcpy(__tmp, __s);
-+       this->_M_name_messages = __tmp;
-+
-+       if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+	 {
-+	   this->_S_destroy_c_locale(this->_M_c_locale_messages);
-+	   this->_S_create_c_locale(this->_M_c_locale_messages, __s);
-+	 }
-+     }
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2008-08-28 17:55:56.000000000 -0700
-@@ -0,0 +1,692 @@
-+// std::moneypunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.6.3.2  moneypunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning optimize this for uclibc
-+#warning tailor for stub locale support
-+#endif
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L)         nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+  // Construct and return valid pattern consisting of some combination of:
-+  // space none symbol sign value
-+  money_base::pattern
-+  money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
-+  {
-+    pattern __ret;
-+
-+    // This insanely complicated routine attempts to construct a valid
-+    // pattern for use with monyepunct. A couple of invariants:
-+
-+    // if (__precedes) symbol -> value
-+    // else value -> symbol
-+
-+    // if (__space) space
-+    // else none
-+
-+    // none == never first
-+    // space never first or last
-+
-+    // Any elegant implementations of this are welcome.
-+    switch (__posn)
-+      {
-+      case 0:
-+      case 1:
-+	// 1 The sign precedes the value and symbol.
-+	__ret.field[0] = sign;
-+	if (__space)
-+	  {
-+	    // Pattern starts with sign.
-+	    if (__precedes)
-+	      {
-+		__ret.field[1] = symbol;
-+		__ret.field[3] = value;
-+	      }
-+	    else
-+	      {
-+		__ret.field[1] = value;
-+		__ret.field[3] = symbol;
-+	      }
-+	    __ret.field[2] = space;
-+	  }
-+	else
-+	  {
-+	    // Pattern starts with sign and ends with none.
-+	    if (__precedes)
-+	      {
-+		__ret.field[1] = symbol;
-+		__ret.field[2] = value;
-+	      }
-+	    else
-+	      {
-+		__ret.field[1] = value;
-+		__ret.field[2] = symbol;
-+	      }
-+	    __ret.field[3] = none;
-+	  }
-+	break;
-+      case 2:
-+	// 2 The sign follows the value and symbol.
-+	if (__space)
-+	  {
-+	    // Pattern either ends with sign.
-+	    if (__precedes)
-+	      {
-+		__ret.field[0] = symbol;
-+		__ret.field[2] = value;
-+	      }
-+	    else
-+	      {
-+		__ret.field[0] = value;
-+		__ret.field[2] = symbol;
-+	      }
-+	    __ret.field[1] = space;
-+	    __ret.field[3] = sign;
-+	  }
-+	else
-+	  {
-+	    // Pattern ends with sign then none.
-+	    if (__precedes)
-+	      {
-+		__ret.field[0] = symbol;
-+		__ret.field[1] = value;
-+	      }
-+	    else
-+	      {
-+		__ret.field[0] = value;
-+		__ret.field[1] = symbol;
-+	      }
-+	    __ret.field[2] = sign;
-+	    __ret.field[3] = none;
-+	  }
-+	break;
-+      case 3:
-+	// 3 The sign immediately precedes the symbol.
-+	if (__precedes)
-+	  {
-+	    __ret.field[0] = sign;
-+	    __ret.field[1] = symbol;
-+	    if (__space)
-+	      {
-+		__ret.field[2] = space;
-+		__ret.field[3] = value;
-+	      }
-+	    else
-+	      {
-+		__ret.field[2] = value;
-+		__ret.field[3] = none;
-+	      }
-+	  }
-+	else
-+	  {
-+	    __ret.field[0] = value;
-+	    if (__space)
-+	      {
-+		__ret.field[1] = space;
-+		__ret.field[2] = sign;
-+		__ret.field[3] = symbol;
-+	      }
-+	    else
-+	      {
-+		__ret.field[1] = sign;
-+		__ret.field[2] = symbol;
-+		__ret.field[3] = none;
-+	      }
-+	  }
-+	break;
-+      case 4:
-+	// 4 The sign immediately follows the symbol.
-+	if (__precedes)
-+	  {
-+	    __ret.field[0] = symbol;
-+	    __ret.field[1] = sign;
-+	    if (__space)
-+	      {
-+		__ret.field[2] = space;
-+		__ret.field[3] = value;
-+	      }
-+	    else
-+	      {
-+		__ret.field[2] = value;
-+		__ret.field[3] = none;
-+	      }
-+	  }
-+	else
-+	  {
-+	    __ret.field[0] = value;
-+	    if (__space)
-+	      {
-+		__ret.field[1] = space;
-+		__ret.field[2] = symbol;
-+		__ret.field[3] = sign;
-+	      }
-+	    else
-+	      {
-+		__ret.field[1] = symbol;
-+		__ret.field[2] = sign;
-+		__ret.field[3] = none;
-+	      }
-+	  }
-+	break;
-+      default:
-+	;
-+      }
-+    return __ret;
-+  }
-+
-+  template<>
-+    void
-+    moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+						     const char*)
-+    {
-+      if (!_M_data)
-+	_M_data = new __moneypunct_cache<char, true>;
-+
-+      if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_data->_M_decimal_point = '.';
-+	  _M_data->_M_thousands_sep = ',';
-+	  _M_data->_M_grouping = "";
-+	  _M_data->_M_grouping_size = 0;
-+	  _M_data->_M_curr_symbol = "";
-+	  _M_data->_M_curr_symbol_size = 0;
-+	  _M_data->_M_positive_sign = "";
-+	  _M_data->_M_positive_sign_size = 0;
-+	  _M_data->_M_negative_sign = "";
-+	  _M_data->_M_negative_sign_size = 0;
-+	  _M_data->_M_frac_digits = 0;
-+	  _M_data->_M_pos_format = money_base::_S_default_pattern;
-+	  _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+	  for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+	    _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+	}
-+      else
-+	{
-+	  // Named locale.
-+	  _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+							__cloc));
-+	  _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+							__cloc));
-+	  _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+	  _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+	  _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+	  _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+	  char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+	  if (!__nposn)
-+	    _M_data->_M_negative_sign = "()";
-+	  else
-+	    _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+							__cloc);
-+	  _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+	  // _Intl == true
-+	  _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+	  _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+	  _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+						      __cloc));
-+	  char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+	  char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+	  char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+	  _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+							__pposn);
-+	  char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+	  char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+	  _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+							__nposn);
-+	}
-+    }
-+
-+  template<>
-+    void
-+    moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+						      const char*)
-+    {
-+      if (!_M_data)
-+	_M_data = new __moneypunct_cache<char, false>;
-+
-+      if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_data->_M_decimal_point = '.';
-+	  _M_data->_M_thousands_sep = ',';
-+	  _M_data->_M_grouping = "";
-+	  _M_data->_M_grouping_size = 0;
-+	  _M_data->_M_curr_symbol = "";
-+	  _M_data->_M_curr_symbol_size = 0;
-+	  _M_data->_M_positive_sign = "";
-+	  _M_data->_M_positive_sign_size = 0;
-+	  _M_data->_M_negative_sign = "";
-+	  _M_data->_M_negative_sign_size = 0;
-+	  _M_data->_M_frac_digits = 0;
-+	  _M_data->_M_pos_format = money_base::_S_default_pattern;
-+	  _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+	  for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+	    _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+	}
-+      else
-+	{
-+	  // Named locale.
-+	  _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+							__cloc));
-+	  _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+							__cloc));
-+	  _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+	  _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+	  _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+	  _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+	  char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+	  if (!__nposn)
-+	    _M_data->_M_negative_sign = "()";
-+	  else
-+	    _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+							__cloc);
-+	  _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+	  // _Intl == false
-+	  _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+	  _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+	  _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+	  char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+	  char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+	  char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+	  _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+							__pposn);
-+	  char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+	  char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+	  _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+							__nposn);
-+	}
-+    }
-+
-+  template<>
-+    moneypunct<char, true>::~moneypunct()
-+    { delete _M_data; }
-+
-+  template<>
-+    moneypunct<char, false>::~moneypunct()
-+    { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  template<>
-+    void
-+    moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+							const char*)
-+#else
-+							const char* __name)
-+#endif
-+    {
-+      if (!_M_data)
-+	_M_data = new __moneypunct_cache<wchar_t, true>;
-+
-+      if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_data->_M_decimal_point = L'.';
-+	  _M_data->_M_thousands_sep = L',';
-+	  _M_data->_M_grouping = "";
-+	  _M_data->_M_grouping_size = 0;
-+	  _M_data->_M_curr_symbol = L"";
-+	  _M_data->_M_curr_symbol_size = 0;
-+	  _M_data->_M_positive_sign = L"";
-+	  _M_data->_M_positive_sign_size = 0;
-+	  _M_data->_M_negative_sign = L"";
-+	  _M_data->_M_negative_sign_size = 0;
-+	  _M_data->_M_frac_digits = 0;
-+	  _M_data->_M_pos_format = money_base::_S_default_pattern;
-+	  _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+	  // Use ctype::widen code without the facet...
-+	  for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+	    _M_data->_M_atoms[__i] =
-+	      static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+	}
-+      else
-+	{
-+	  // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	  __c_locale __old = __uselocale(__cloc);
-+#else
-+	  // Switch to named locale so that mbsrtowcs will work.
-+	  char* __old = strdup(setlocale(LC_ALL, NULL));
-+	  setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+	  union { char *__s; wchar_t __w; } __u;
-+	  __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+	  _M_data->_M_decimal_point = __u.__w;
-+
-+	  __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+	  _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+	  _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+	  _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+	  const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+	  const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+	  const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+
-+	  wchar_t* __wcs_ps = 0;
-+	  wchar_t* __wcs_ns = 0;
-+	  const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+	  try
-+	    {
-+	      mbstate_t __state;
-+	      size_t __len = strlen(__cpossign);
-+	      if (__len)
-+		{
-+		  ++__len;
-+		  memset(&__state, 0, sizeof(mbstate_t));
-+		  __wcs_ps = new wchar_t[__len];
-+		  mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+		  _M_data->_M_positive_sign = __wcs_ps;
-+		}
-+	      else
-+		_M_data->_M_positive_sign = L"";
-+	      _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+	      __len = strlen(__cnegsign);
-+	      if (!__nposn)
-+		_M_data->_M_negative_sign = L"()";
-+	      else if (__len)
-+		{
-+		  ++__len;
-+		  memset(&__state, 0, sizeof(mbstate_t));
-+		  __wcs_ns = new wchar_t[__len];
-+		  mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+		  _M_data->_M_negative_sign = __wcs_ns;
-+		}
-+	      else
-+		_M_data->_M_negative_sign = L"";
-+	      _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+	      // _Intl == true.
-+	      __len = strlen(__ccurr);
-+	      if (__len)
-+		{
-+		  ++__len;
-+		  memset(&__state, 0, sizeof(mbstate_t));
-+		  wchar_t* __wcs = new wchar_t[__len];
-+		  mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+		  _M_data->_M_curr_symbol = __wcs;
-+		}
-+	      else
-+		_M_data->_M_curr_symbol = L"";
-+	      _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+	    }
-+	  catch (...)
-+	    {
-+	      delete _M_data;
-+	      _M_data = 0;
-+	      delete __wcs_ps;
-+	      delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	      __uselocale(__old);
-+#else
-+	      setlocale(LC_ALL, __old);
-+	      free(__old);
-+#endif
-+	      __throw_exception_again;
-+	    }
-+
-+	  _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+						      __cloc));
-+	  char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+	  char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+	  char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+	  _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+							__pposn);
-+	  char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+	  char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+	  _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+							__nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	  __uselocale(__old);
-+#else
-+	  setlocale(LC_ALL, __old);
-+	  free(__old);
-+#endif
-+	}
-+    }
-+
-+  template<>
-+  void
-+  moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+						       const char*)
-+#else
-+                                                       const char* __name)
-+#endif
-+  {
-+    if (!_M_data)
-+      _M_data = new __moneypunct_cache<wchar_t, false>;
-+
-+    if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_data->_M_decimal_point = L'.';
-+	  _M_data->_M_thousands_sep = L',';
-+	  _M_data->_M_grouping = "";
-+          _M_data->_M_grouping_size = 0;
-+	  _M_data->_M_curr_symbol = L"";
-+	  _M_data->_M_curr_symbol_size = 0;
-+	  _M_data->_M_positive_sign = L"";
-+	  _M_data->_M_positive_sign_size = 0;
-+	  _M_data->_M_negative_sign = L"";
-+	  _M_data->_M_negative_sign_size = 0;
-+	  _M_data->_M_frac_digits = 0;
-+	  _M_data->_M_pos_format = money_base::_S_default_pattern;
-+	  _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+	  // Use ctype::widen code without the facet...
-+	  for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+	    _M_data->_M_atoms[__i] =
-+	      static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+	}
-+      else
-+	{
-+	  // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	  __c_locale __old = __uselocale(__cloc);
-+#else
-+	  // Switch to named locale so that mbsrtowcs will work.
-+	  char* __old = strdup(setlocale(LC_ALL, NULL));
-+	  setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+          union { char *__s; wchar_t __w; } __u;
-+	  __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+	  _M_data->_M_decimal_point = __u.__w;
-+
-+	  __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+	  _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+	  _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+          _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+	  const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+	  const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+	  const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+
-+	  wchar_t* __wcs_ps = 0;
-+	  wchar_t* __wcs_ns = 0;
-+	  const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+	  try
-+            {
-+              mbstate_t __state;
-+              size_t __len;
-+              __len = strlen(__cpossign);
-+              if (__len)
-+                {
-+		  ++__len;
-+		  memset(&__state, 0, sizeof(mbstate_t));
-+		  __wcs_ps = new wchar_t[__len];
-+		  mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+		  _M_data->_M_positive_sign = __wcs_ps;
-+		}
-+	      else
-+		_M_data->_M_positive_sign = L"";
-+              _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+	      __len = strlen(__cnegsign);
-+	      if (!__nposn)
-+		_M_data->_M_negative_sign = L"()";
-+	      else if (__len)
-+		{
-+		  ++__len;
-+		  memset(&__state, 0, sizeof(mbstate_t));
-+		  __wcs_ns = new wchar_t[__len];
-+		  mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+		  _M_data->_M_negative_sign = __wcs_ns;
-+		}
-+	      else
-+		_M_data->_M_negative_sign = L"";
-+              _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+	      // _Intl == true.
-+	      __len = strlen(__ccurr);
-+	      if (__len)
-+		{
-+		  ++__len;
-+		  memset(&__state, 0, sizeof(mbstate_t));
-+		  wchar_t* __wcs = new wchar_t[__len];
-+		  mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+		  _M_data->_M_curr_symbol = __wcs;
-+		}
-+	      else
-+		_M_data->_M_curr_symbol = L"";
-+              _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+	    }
-+          catch (...)
-+	    {
-+	      delete _M_data;
-+              _M_data = 0;
-+	      delete __wcs_ps;
-+	      delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	      __uselocale(__old);
-+#else
-+	      setlocale(LC_ALL, __old);
-+	      free(__old);
-+#endif
-+              __throw_exception_again;
-+	    }
-+
-+	  _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+	  char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+	  char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+	  char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+	  _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+	                                                __pposn);
-+	  char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+	  char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+	  _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+	                                                __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	  __uselocale(__old);
-+#else
-+	  setlocale(LC_ALL, __old);
-+	  free(__old);
-+#endif
-+	}
-+    }
-+
-+  template<>
-+    moneypunct<wchar_t, true>::~moneypunct()
-+    {
-+      if (_M_data->_M_positive_sign_size)
-+	delete [] _M_data->_M_positive_sign;
-+      if (_M_data->_M_negative_sign_size
-+          && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+	delete [] _M_data->_M_negative_sign;
-+      if (_M_data->_M_curr_symbol_size)
-+	delete [] _M_data->_M_curr_symbol;
-+      delete _M_data;
-+    }
-+
-+  template<>
-+    moneypunct<wchar_t, false>::~moneypunct()
-+    {
-+      if (_M_data->_M_positive_sign_size)
-+	delete [] _M_data->_M_positive_sign;
-+      if (_M_data->_M_negative_sign_size
-+          && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+	delete [] _M_data->_M_negative_sign;
-+      if (_M_data->_M_curr_symbol_size)
-+	delete [] _M_data->_M_curr_symbol;
-+      delete _M_data;
-+    }
-+#endif
-+}
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2008-08-28 17:55:56.000000000 -0700
-@@ -0,0 +1,160 @@
-+// std::numpunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.3.1.2  numpunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L)         nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+  template<>
-+    void
-+    numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
-+    {
-+      if (!_M_data)
-+	_M_data = new __numpunct_cache<char>;
-+
-+      if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_data->_M_grouping = "";
-+	  _M_data->_M_grouping_size = 0;
-+	  _M_data->_M_use_grouping = false;
-+
-+	  _M_data->_M_decimal_point = '.';
-+	  _M_data->_M_thousands_sep = ',';
-+
-+	  for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+	    _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i];
-+
-+	  for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+	    _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
-+	}
-+      else
-+	{
-+	  // Named locale.
-+	  _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
-+							__cloc));
-+	  _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
-+							__cloc));
-+
-+	  // Check for NULL, which implies no grouping.
-+	  if (_M_data->_M_thousands_sep == '\0')
-+	    _M_data->_M_grouping = "";
-+	  else
-+	    _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+	  _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+	}
-+
-+      // NB: There is no way to extact this info from posix locales.
-+      // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+      _M_data->_M_truename = "true";
-+      _M_data->_M_truename_size = 4;
-+      // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+      _M_data->_M_falsename = "false";
-+      _M_data->_M_falsename_size = 5;
-+    }
-+
-+  template<>
-+    numpunct<char>::~numpunct()
-+    { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  template<>
-+    void
-+    numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
-+    {
-+      if (!_M_data)
-+	_M_data = new __numpunct_cache<wchar_t>;
-+
-+      if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_data->_M_grouping = "";
-+	  _M_data->_M_grouping_size = 0;
-+	  _M_data->_M_use_grouping = false;
-+
-+	  _M_data->_M_decimal_point = L'.';
-+	  _M_data->_M_thousands_sep = L',';
-+
-+	  // Use ctype::widen code without the facet...
-+	  for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+	    _M_data->_M_atoms_out[__i] =
-+	      static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
-+
-+	  for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+	    _M_data->_M_atoms_in[__j] =
-+	      static_cast<wchar_t>(__num_base::_S_atoms_in[__j]);
-+	}
-+      else
-+	{
-+	  // Named locale.
-+	  // NB: In the GNU model wchar_t is always 32 bit wide.
-+	  union { char *__s; wchar_t __w; } __u;
-+	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
-+	  _M_data->_M_decimal_point = __u.__w;
-+
-+	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
-+	  _M_data->_M_thousands_sep = __u.__w;
-+
-+	  if (_M_data->_M_thousands_sep == L'\0')
-+	    _M_data->_M_grouping = "";
-+	  else
-+	    _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+	  _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+	}
-+
-+      // NB: There is no way to extact this info from posix locales.
-+      // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+      _M_data->_M_truename = L"true";
-+      _M_data->_M_truename_size = 4;
-+      // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+      _M_data->_M_falsename = L"false";
-+      _M_data->_M_falsename_size = 5;
-+    }
-+
-+  template<>
-+    numpunct<wchar_t>::~numpunct()
-+    { delete _M_data; }
-+ #endif
-+}
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc	2008-08-28 17:55:56.000000000 -0700
-@@ -0,0 +1,406 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L)         nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+  template<>
-+    void
-+    __timepunct<char>::
-+    _M_put(char* __s, size_t __maxlen, const char* __format,
-+	   const tm* __tm) const
-+    {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+      const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
-+					_M_c_locale_timepunct);
-+#else
-+      char* __old = strdup(setlocale(LC_ALL, NULL));
-+      setlocale(LC_ALL, _M_name_timepunct);
-+      const size_t __len = strftime(__s, __maxlen, __format, __tm);
-+      setlocale(LC_ALL, __old);
-+      free(__old);
-+#endif
-+      // Make sure __s is null terminated.
-+      if (__len == 0)
-+	__s[0] = '\0';
-+    }
-+
-+  template<>
-+    void
-+    __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
-+    {
-+      if (!_M_data)
-+	_M_data = new __timepunct_cache<char>;
-+
-+      if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_c_locale_timepunct = _S_get_c_locale();
-+
-+	  _M_data->_M_date_format = "%m/%d/%y";
-+	  _M_data->_M_date_era_format = "%m/%d/%y";
-+	  _M_data->_M_time_format = "%H:%M:%S";
-+	  _M_data->_M_time_era_format = "%H:%M:%S";
-+	  _M_data->_M_date_time_format = "";
-+	  _M_data->_M_date_time_era_format = "";
-+	  _M_data->_M_am = "AM";
-+	  _M_data->_M_pm = "PM";
-+	  _M_data->_M_am_pm_format = "";
-+
-+	  // Day names, starting with "C"'s Sunday.
-+	  _M_data->_M_day1 = "Sunday";
-+	  _M_data->_M_day2 = "Monday";
-+	  _M_data->_M_day3 = "Tuesday";
-+	  _M_data->_M_day4 = "Wednesday";
-+	  _M_data->_M_day5 = "Thursday";
-+	  _M_data->_M_day6 = "Friday";
-+	  _M_data->_M_day7 = "Saturday";
-+
-+	  // Abbreviated day names, starting with "C"'s Sun.
-+	  _M_data->_M_aday1 = "Sun";
-+	  _M_data->_M_aday2 = "Mon";
-+	  _M_data->_M_aday3 = "Tue";
-+	  _M_data->_M_aday4 = "Wed";
-+	  _M_data->_M_aday5 = "Thu";
-+	  _M_data->_M_aday6 = "Fri";
-+	  _M_data->_M_aday7 = "Sat";
-+
-+	  // Month names, starting with "C"'s January.
-+	  _M_data->_M_month01 = "January";
-+	  _M_data->_M_month02 = "February";
-+	  _M_data->_M_month03 = "March";
-+	  _M_data->_M_month04 = "April";
-+	  _M_data->_M_month05 = "May";
-+	  _M_data->_M_month06 = "June";
-+	  _M_data->_M_month07 = "July";
-+	  _M_data->_M_month08 = "August";
-+	  _M_data->_M_month09 = "September";
-+	  _M_data->_M_month10 = "October";
-+	  _M_data->_M_month11 = "November";
-+	  _M_data->_M_month12 = "December";
-+
-+	  // Abbreviated month names, starting with "C"'s Jan.
-+	  _M_data->_M_amonth01 = "Jan";
-+	  _M_data->_M_amonth02 = "Feb";
-+	  _M_data->_M_amonth03 = "Mar";
-+	  _M_data->_M_amonth04 = "Apr";
-+	  _M_data->_M_amonth05 = "May";
-+	  _M_data->_M_amonth06 = "Jun";
-+	  _M_data->_M_amonth07 = "Jul";
-+	  _M_data->_M_amonth08 = "Aug";
-+	  _M_data->_M_amonth09 = "Sep";
-+	  _M_data->_M_amonth10 = "Oct";
-+	  _M_data->_M_amonth11 = "Nov";
-+	  _M_data->_M_amonth12 = "Dec";
-+	}
-+      else
-+	{
-+	  _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+	  _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
-+	  _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
-+	  _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
-+	  _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
-+	  _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
-+	  _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT,
-+							     __cloc);
-+	  _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
-+	  _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
-+	  _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
-+
-+	  // Day names, starting with "C"'s Sunday.
-+	  _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
-+	  _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
-+	  _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
-+	  _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
-+	  _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
-+	  _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
-+	  _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
-+
-+	  // Abbreviated day names, starting with "C"'s Sun.
-+	  _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc);
-+	  _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc);
-+	  _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc);
-+	  _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc);
-+	  _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc);
-+	  _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc);
-+	  _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc);
-+
-+	  // Month names, starting with "C"'s January.
-+	  _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc);
-+	  _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc);
-+	  _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc);
-+	  _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc);
-+	  _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc);
-+	  _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc);
-+	  _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc);
-+	  _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc);
-+	  _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc);
-+	  _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc);
-+	  _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc);
-+	  _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc);
-+
-+	  // Abbreviated month names, starting with "C"'s Jan.
-+	  _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc);
-+	  _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc);
-+	  _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc);
-+	  _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc);
-+	  _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc);
-+	  _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc);
-+	  _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc);
-+	  _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc);
-+	  _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc);
-+	  _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc);
-+	  _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc);
-+	  _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc);
-+	}
-+    }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  template<>
-+    void
-+    __timepunct<wchar_t>::
-+    _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
-+	   const tm* __tm) const
-+    {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+      __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
-+      const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
-+					_M_c_locale_timepunct);
-+#else
-+      char* __old = strdup(setlocale(LC_ALL, NULL));
-+      setlocale(LC_ALL, _M_name_timepunct);
-+      const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
-+      setlocale(LC_ALL, __old);
-+      free(__old);
-+#endif
-+      // Make sure __s is null terminated.
-+      if (__len == 0)
-+	__s[0] = L'\0';
-+    }
-+
-+  template<>
-+    void
-+    __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
-+    {
-+      if (!_M_data)
-+	_M_data = new __timepunct_cache<wchar_t>;
-+
-+#warning wide time stuff
-+//       if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_c_locale_timepunct = _S_get_c_locale();
-+
-+	  _M_data->_M_date_format = L"%m/%d/%y";
-+	  _M_data->_M_date_era_format = L"%m/%d/%y";
-+	  _M_data->_M_time_format = L"%H:%M:%S";
-+	  _M_data->_M_time_era_format = L"%H:%M:%S";
-+	  _M_data->_M_date_time_format = L"";
-+	  _M_data->_M_date_time_era_format = L"";
-+	  _M_data->_M_am = L"AM";
-+	  _M_data->_M_pm = L"PM";
-+	  _M_data->_M_am_pm_format = L"";
-+
-+	  // Day names, starting with "C"'s Sunday.
-+	  _M_data->_M_day1 = L"Sunday";
-+	  _M_data->_M_day2 = L"Monday";
-+	  _M_data->_M_day3 = L"Tuesday";
-+	  _M_data->_M_day4 = L"Wednesday";
-+	  _M_data->_M_day5 = L"Thursday";
-+	  _M_data->_M_day6 = L"Friday";
-+	  _M_data->_M_day7 = L"Saturday";
-+
-+	  // Abbreviated day names, starting with "C"'s Sun.
-+	  _M_data->_M_aday1 = L"Sun";
-+	  _M_data->_M_aday2 = L"Mon";
-+	  _M_data->_M_aday3 = L"Tue";
-+	  _M_data->_M_aday4 = L"Wed";
-+	  _M_data->_M_aday5 = L"Thu";
-+	  _M_data->_M_aday6 = L"Fri";
-+	  _M_data->_M_aday7 = L"Sat";
-+
-+	  // Month names, starting with "C"'s January.
-+	  _M_data->_M_month01 = L"January";
-+	  _M_data->_M_month02 = L"February";
-+	  _M_data->_M_month03 = L"March";
-+	  _M_data->_M_month04 = L"April";
-+	  _M_data->_M_month05 = L"May";
-+	  _M_data->_M_month06 = L"June";
-+	  _M_data->_M_month07 = L"July";
-+	  _M_data->_M_month08 = L"August";
-+	  _M_data->_M_month09 = L"September";
-+	  _M_data->_M_month10 = L"October";
-+	  _M_data->_M_month11 = L"November";
-+	  _M_data->_M_month12 = L"December";
-+
-+	  // Abbreviated month names, starting with "C"'s Jan.
-+	  _M_data->_M_amonth01 = L"Jan";
-+	  _M_data->_M_amonth02 = L"Feb";
-+	  _M_data->_M_amonth03 = L"Mar";
-+	  _M_data->_M_amonth04 = L"Apr";
-+	  _M_data->_M_amonth05 = L"May";
-+	  _M_data->_M_amonth06 = L"Jun";
-+	  _M_data->_M_amonth07 = L"Jul";
-+	  _M_data->_M_amonth08 = L"Aug";
-+	  _M_data->_M_amonth09 = L"Sep";
-+	  _M_data->_M_amonth10 = L"Oct";
-+	  _M_data->_M_amonth11 = L"Nov";
-+	  _M_data->_M_amonth12 = L"Dec";
-+	}
-+#if 0
-+      else
-+	{
-+	  _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+	  union { char *__s; wchar_t *__w; } __u;
-+
-+	  __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc);
-+	  _M_data->_M_date_format = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc);
-+	  _M_data->_M_date_era_format = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc);
-+	  _M_data->_M_time_format = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc);
-+	  _M_data->_M_time_era_format = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc);
-+	  _M_data->_M_date_time_format = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc);
-+	  _M_data->_M_date_time_era_format = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc);
-+	  _M_data->_M_am = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc);
-+	  _M_data->_M_pm = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc);
-+	  _M_data->_M_am_pm_format = __u.__w;
-+
-+	  // Day names, starting with "C"'s Sunday.
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc);
-+	  _M_data->_M_day1 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc);
-+	  _M_data->_M_day2 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc);
-+	  _M_data->_M_day3 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc);
-+	  _M_data->_M_day4 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc);
-+	  _M_data->_M_day5 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc);
-+	  _M_data->_M_day6 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc);
-+	  _M_data->_M_day7 = __u.__w;
-+
-+	  // Abbreviated day names, starting with "C"'s Sun.
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc);
-+	  _M_data->_M_aday1 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc);
-+	  _M_data->_M_aday2 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc);
-+	  _M_data->_M_aday3 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc);
-+	  _M_data->_M_aday4 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc);
-+	  _M_data->_M_aday5 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc);
-+	  _M_data->_M_aday6 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc);
-+	  _M_data->_M_aday7 = __u.__w;
-+
-+	  // Month names, starting with "C"'s January.
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc);
-+	  _M_data->_M_month01 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc);
-+	  _M_data->_M_month02 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc);
-+	  _M_data->_M_month03 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc);
-+	  _M_data->_M_month04 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc);
-+	  _M_data->_M_month05 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc);
-+	  _M_data->_M_month06 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc);
-+	  _M_data->_M_month07 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc);
-+	  _M_data->_M_month08 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc);
-+	  _M_data->_M_month09 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc);
-+	  _M_data->_M_month10 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc);
-+	  _M_data->_M_month11 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc);
-+	  _M_data->_M_month12 = __u.__w;
-+
-+	  // Abbreviated month names, starting with "C"'s Jan.
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc);
-+	  _M_data->_M_amonth01 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc);
-+	  _M_data->_M_amonth02 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc);
-+	  _M_data->_M_amonth03 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc);
-+	  _M_data->_M_amonth04 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc);
-+	  _M_data->_M_amonth05 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc);
-+	  _M_data->_M_amonth06 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc);
-+	  _M_data->_M_amonth07 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc);
-+	  _M_data->_M_amonth08 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc);
-+	  _M_data->_M_amonth09 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc);
-+	  _M_data->_M_amonth10 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc);
-+	  _M_data->_M_amonth11 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc);
-+	  _M_data->_M_amonth12 = __u.__w;
-+	}
-+#endif // 0
-+    }
-+#endif
-+}
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h	2008-08-28 17:55:56.000000000 -0700
-@@ -0,0 +1,68 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+  template<typename _CharT>
-+    __timepunct<_CharT>::__timepunct(size_t __refs)
-+    : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+    _M_name_timepunct(_S_get_c_name())
-+    { _M_initialize_timepunct(); }
-+
-+  template<typename _CharT>
-+    __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
-+    : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
-+    _M_name_timepunct(_S_get_c_name())
-+    { _M_initialize_timepunct(); }
-+
-+  template<typename _CharT>
-+    __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
-+				     size_t __refs)
-+    : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+    _M_name_timepunct(__s)
-+    {
-+      char* __tmp = new char[std::strlen(__s) + 1];
-+      std::strcpy(__tmp, __s);
-+      _M_name_timepunct = __tmp;
-+      _M_initialize_timepunct(__cloc);
-+    }
-+
-+  template<typename _CharT>
-+    __timepunct<_CharT>::~__timepunct()
-+    {
-+      if (_M_name_timepunct != _S_get_c_name())
-+	delete [] _M_name_timepunct;
-+      delete _M_data;
-+      _S_destroy_c_locale(_M_c_locale_timepunct);
-+    }
-Index: gcc-4.3.2/libstdc++-v3/configure
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/configure	2008-07-07 12:49:54.000000000 -0700
-+++ gcc-4.3.2/libstdc++-v3/configure	2008-08-28 18:02:13.000000000 -0700
-@@ -14003,7 +14003,7 @@
-   enableval="$enable_clocale"
- 
-       case "$enableval" in
--       generic|gnu|ieee_1003.1-2001|yes|no|auto) ;;
-+       generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;;
-        *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
- echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
-    { (exit 1); exit 1; }; } ;;
-@@ -14036,6 +14036,9 @@
-   # Default to "generic".
-   if test $enable_clocale_flag = auto; then
-     case ${target_os} in
-+      *-uclibc*)
-+        enable_clocale_flag=uclibc
-+        ;;
-       linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
-         enable_clocale_flag=gnu
-         ;;
-@@ -14424,6 +14427,76 @@
-       CTIME_CC=config/locale/generic/time_members.cc
-       CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
-       ;;
-+    uclibc)
-+      echo "$as_me:$LINENO: result: uclibc" >&5
-+echo "${ECHO_T}uclibc" >&6
-+
-+      # Declare intention to use gettext, and add support for specific
-+      # languages.
-+      # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+      ALL_LINGUAS="de fr"
-+
-+      # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+      # Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_check_msgfmt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$check_msgfmt"; then
-+  ac_cv_prog_check_msgfmt="$check_msgfmt" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_check_msgfmt="yes"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+  test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no"
-+fi
-+fi
-+check_msgfmt=$ac_cv_prog_check_msgfmt
-+if test -n "$check_msgfmt"; then
-+  echo "$as_me:$LINENO: result: $check_msgfmt" >&5
-+echo "${ECHO_T}$check_msgfmt" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+      if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+        USE_NLS=yes
-+      fi
-+      # Export the build objects.
-+      for ling in $ALL_LINGUAS; do \
-+        glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+        glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+      done
-+
-+
-+
-+      CLOCALE_H=config/locale/uclibc/c_locale.h
-+      CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+      CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+      CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+      CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+      CMESSAGES_H=config/locale/uclibc/messages_members.h
-+      CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+      CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+      CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+      CTIME_H=config/locale/uclibc/time_members.h
-+      CTIME_CC=config/locale/uclibc/time_members.cc
-+      CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+      ;;
-   esac
- 
-   # This is where the testsuite looks for locale catalogs, using the
-@@ -17016,7 +17089,7 @@
- 
-   # Fake what AC_TRY_COMPILE does.  XXX Look at redoing this new-style.
-     cat > conftest.$ac_ext << EOF
--#line 17019 "configure"
-+#line 17092 "configure"
- int main()
- {
-   // NB: _Atomic_word not necessarily int.
-Index: gcc-4.3.2/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/include/c_compatibility/wchar.h	2007-03-04 14:59:49.000000000 -0800
-+++ gcc-4.3.2/libstdc++-v3/include/c_compatibility/wchar.h	2008-08-28 17:55:56.000000000 -0700
-@@ -106,7 +106,9 @@
- using std::wmemcpy;
- using std::wmemmove;
- using std::wmemset;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using std::wcsftime;
-+#endif
- 
- #if _GLIBCXX_USE_C99
- using std::wcstold;
-Index: gcc-4.3.2/libstdc++-v3/include/c_std/cwchar
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/include/c_std/cwchar	2007-05-27 07:50:21.000000000 -0700
-+++ gcc-4.3.2/libstdc++-v3/include/c_std/cwchar	2008-08-28 17:55:56.000000000 -0700
-@@ -182,7 +182,9 @@
-   using ::wcscoll;
-   using ::wcscpy;
-   using ::wcscspn;
-+#if _GLIBCXX_HAVE_WCSFTIME
-   using ::wcsftime;
-+#endif
-   using ::wcslen;
-   using ::wcsncat;
-   using ::wcsncmp;
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch
deleted file mode 100644
index f39e652..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch
+++ /dev/null
@@ -1,233 +0,0 @@ 
-Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-===================================================================
---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	2008-08-16 01:29:20.000000000 -0700
-+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	2008-08-16 01:33:23.000000000 -0700
-@@ -60,4 +60,49 @@
- extern "C" __typeof(wctype_l) __wctype_l;
- #endif
- 
-+# define __nl_langinfo_l nl_langinfo_l
-+# define __strcoll_l strcoll_l
-+# define __strftime_l strftime_l
-+# define __strtod_l strtod_l
-+# define __strtof_l strtof_l
-+# define __strtold_l strtold_l
-+# define __strxfrm_l strxfrm_l
-+# define __newlocale newlocale
-+# define __freelocale freelocale
-+# define __duplocale duplocale
-+# define __uselocale uselocale
-+
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+#  define __iswctype_l iswctype_l
-+#  define __towlower_l towlower_l
-+#  define __towupper_l towupper_l
-+#  define __wcscoll_l wcscoll_l
-+#  define __wcsftime_l wcsftime_l
-+#  define __wcsxfrm_l wcsxfrm_l
-+#  define __wctype_l wctype_l
-+# endif
-+
-+#else
-+# define __nl_langinfo_l(N, L)       nl_langinfo((N))
-+# define __strcoll_l(S1, S2, L)      strcoll((S1), (S2))
-+# define __strtod_l(S, E, L)         strtod((S), (E))
-+# define __strtof_l(S, E, L)         strtof((S), (E))
-+# define __strtold_l(S, E, L)        strtold((S), (E))
-+# define __strxfrm_l(S1, S2, N, L)   strxfrm((S1), (S2), (N))
-+# warning should dummy __newlocale check for C|POSIX ?
-+# define __newlocale(a, b, c)        NULL
-+# define __freelocale(a)             ((void)0)
-+# define __duplocale(a)              __c_locale()
-+//# define __uselocale ?
-+//
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+#  define __iswctype_l(C, M, L)       iswctype((C), (M))
-+#  define __towlower_l(C, L)          towlower((C))
-+#  define __towupper_l(C, L)          towupper((C))
-+#  define __wcscoll_l(S1, S2, L)      wcscoll((S1), (S2))
-+//#  define __wcsftime_l(S, M, F, T, L)  wcsftime((S), (M), (F), (T))
-+#  define __wcsxfrm_l(S1, S2, N, L)   wcsxfrm((S1), (S2), (N))
-+#  define __wctype_l(S, L)            wctype((S))
-+# endif
-+
- #endif // GLIBC 2.3 and later
-Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
-===================================================================
---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc	2008-08-16 01:29:20.000000000 -0700
-+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc	2008-08-16 01:33:00.000000000 -0700
-@@ -39,20 +39,6 @@
- #include <langinfo.h>
- #include <bits/c++locale_internal.h>
- 
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __strtol_l(S, E, B, L)      strtol((S), (E), (B))
--#define __strtoul_l(S, E, B, L)     strtoul((S), (E), (B))
--#define __strtoll_l(S, E, B, L)     strtoll((S), (E), (B))
--#define __strtoull_l(S, E, B, L)    strtoull((S), (E), (B))
--#define __strtof_l(S, E, L)         strtof((S), (E))
--#define __strtod_l(S, E, L)         strtod((S), (E))
--#define __strtold_l(S, E, L)        strtold((S), (E))
--#warning should dummy __newlocale check for C|POSIX ?
--#define __newlocale(a, b, c)        NULL
--#define __freelocale(a)             ((void)0)
--#define __duplocale(a)              __c_locale()
--#endif
--
- namespace std
- {
-   template<>
-Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc
-===================================================================
---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc	2008-08-16 01:29:20.000000000 -0700
-+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc	2008-08-16 01:30:31.000000000 -0700
-@@ -36,13 +36,6 @@
- #include <locale>
- #include <bits/c++locale_internal.h>
- 
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __strcoll_l(S1, S2, L)      strcoll((S1), (S2))
--#define __strxfrm_l(S1, S2, N, L)   strxfrm((S1), (S2), (N))
--#define __wcscoll_l(S1, S2, L)      wcscoll((S1), (S2))
--#define __wcsxfrm_l(S1, S2, N, L)   wcsxfrm((S1), (S2), (N))
--#endif
--
- namespace std
- {
-   // These are basically extensions to char_traits, and perhaps should
-Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-===================================================================
---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2008-08-16 01:29:20.000000000 -0700
-+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2008-08-16 01:30:31.000000000 -0700
-@@ -43,10 +43,6 @@
- #warning tailor for stub locale support
- #endif
- 
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L)         nl_langinfo((N))
--#endif
--
- namespace std
- {
-   // Construct and return valid pattern consisting of some combination of:
-Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-===================================================================
---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2008-08-16 01:29:20.000000000 -0700
-+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2008-08-16 01:30:31.000000000 -0700
-@@ -41,9 +41,6 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning tailor for stub locale support
- #endif
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L)         nl_langinfo((N))
--#endif
- 
- namespace std
- {
-Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc
-===================================================================
---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc	2008-08-16 01:29:20.000000000 -0700
-+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc	2008-08-16 01:30:31.000000000 -0700
-@@ -40,9 +40,6 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning tailor for stub locale support
- #endif
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L)         nl_langinfo((N))
--#endif
- 
- namespace std
- {
-Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-===================================================================
---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2008-08-16 01:29:20.000000000 -0700
-+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2008-08-16 01:30:31.000000000 -0700
-@@ -38,13 +38,6 @@
- #undef _LIBC
- #include <bits/c++locale_internal.h>
- 
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __wctype_l(S, L)           wctype((S))
--#define __towupper_l(C, L)         towupper((C))
--#define __towlower_l(C, L)         towlower((C))
--#define __iswctype_l(C, M, L)      iswctype((C), (M))
--#endif
--
- namespace std
- {
-   // NB: The other ctype<char> specializations are in src/locale.cc and
-Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc
-===================================================================
---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc	2008-08-16 01:27:18.000000000 -0700
-+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc	2008-08-16 01:30:31.000000000 -0700
-@@ -39,13 +39,10 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix gettext stuff
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--extern "C" char *__dcgettext(const char *domainname,
--			     const char *msgid, int category);
- #undef gettext
--#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#define gettext(msgid) dcgettext(NULL, msgid, LC_MESSAGES)
- #else
--#undef gettext
- #define gettext(msgid) (msgid)
- #endif
- 
-Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h
-===================================================================
---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2008-08-16 01:29:20.000000000 -0700
-+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h	2008-08-16 01:31:43.000000000 -0700
-@@ -36,15 +36,11 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--extern "C" char *__textdomain(const char *domainname);
--extern "C" char *__bindtextdomain(const char *domainname,
--				  const char *dirname);
--#else
--#undef __textdomain
--#undef __bindtextdomain
--#define __textdomain(D)           ((void)0)
--#define __bindtextdomain(D,P)     ((void)0)
-+#ifndef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#undef textdomain
-+#undef bindtextdomain
-+#define textdomain(D)           ((void)0)
-+#define bindtextdomain(D,P)     ((void)0)
- #endif
- 
-   // Non-virtual member functions.
-@@ -70,7 +66,7 @@
-     messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
- 			   const char* __dir) const
-     {
--      __bindtextdomain(__s.c_str(), __dir);
-+      bindtextdomain(__s.c_str(), __dir);
-       return this->do_open(__s, __loc);
-     }
- 
-@@ -90,7 +86,7 @@
-     {
-       // No error checking is done, assume the catalog exists and can
-       // be used.
--      __textdomain(__s.c_str());
-+      textdomain(__s.c_str());
-       return 0;
-     }
- 
-Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h
-===================================================================
---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h	2008-08-16 01:29:20.000000000 -0700
-+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h	2008-08-16 01:30:31.000000000 -0700
-@@ -68,6 +68,7 @@
- {
-   extern "C" __typeof(uselocale) __uselocale;
- }
-+#define __uselocale uselocale
- #endif
- 
- namespace std
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/204-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/204-uclibc-locale-wchar_fix.patch
deleted file mode 100644
index 160ab35..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/204-uclibc-locale-wchar_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@ 
---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2006-03-10 15:37:27 +0100
-@@ -401,7 +401,7 @@
- # ifdef __UCLIBC_HAS_XLOCALE__
- 	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- 	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# elif defined __UCLIBC_HAS_LOCALE__
- 	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
- 	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
- # endif
-@@ -556,7 +556,7 @@
- # ifdef __UCLIBC_HAS_XLOCALE__
- 	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- 	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# elif defined __UCLIBC_HAS_LOCALE__
- 	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
- 	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
- # endif
---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2006-03-10 15:37:27 +0100
-@@ -127,12 +127,25 @@
- 	{
- 	  // Named locale.
- 	  // NB: In the GNU model wchar_t is always 32 bit wide.
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be numeric
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# elif defined __UCLIBC_HAS_LOCALE__
-+	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
- 	  union { char *__s; wchar_t __w; } __u;
- 	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
- 	  _M_data->_M_decimal_point = __u.__w;
- 
- 	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
- 	  _M_data->_M_thousands_sep = __u.__w;
-+#endif
- 
- 	  if (_M_data->_M_thousands_sep == L'\0')
- 	    _M_data->_M_grouping = "";
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/205-uclibc-locale-update.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/205-uclibc-locale-update.patch
deleted file mode 100644
index 48eaa1d..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/205-uclibc-locale-update.patch
+++ /dev/null
@@ -1,519 +0,0 @@ 
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc	2008-09-17 22:35:28.000000000 -0700
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc	2008-09-17 22:35:29.000000000 -0700
-@@ -39,23 +39,20 @@
- #include <langinfo.h>
- #include <bits/c++locale_internal.h>
- 
--namespace std
--{
-+_GLIBCXX_BEGIN_NAMESPACE(std)
-+
-   template<>
-     void
-     __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
- 		   const __c_locale& __cloc)
-     {
--      if (!(__err & ios_base::failbit))
--	{
--	  char* __sanity;
--	  errno = 0;
--	  float __f = __strtof_l(__s, &__sanity, __cloc);
--          if (__sanity != __s && errno != ERANGE)
--	    __v = __f;
--	  else
--	    __err |= ios_base::failbit;
--	}
-+      char* __sanity;
-+      errno = 0;
-+      float __f = __strtof_l(__s, &__sanity, __cloc);
-+      if (__sanity != __s && errno != ERANGE)
-+	__v = __f;
-+      else
-+	__err |= ios_base::failbit;
-     }
- 
-   template<>
-@@ -63,16 +60,13 @@
-     __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
- 		   const __c_locale& __cloc)
-     {
--      if (!(__err & ios_base::failbit))
--	{
--	  char* __sanity;
--	  errno = 0;
--	  double __d = __strtod_l(__s, &__sanity, __cloc);
--          if (__sanity != __s && errno != ERANGE)
--	    __v = __d;
--	  else
--	    __err |= ios_base::failbit;
--	}
-+      char* __sanity;
-+      errno = 0;
-+      double __d = __strtod_l(__s, &__sanity, __cloc);
-+      if (__sanity != __s && errno != ERANGE)
-+	__v = __d;
-+      else
-+	__err |= ios_base::failbit;
-     }
- 
-   template<>
-@@ -80,16 +74,13 @@
-     __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
- 		   const __c_locale& __cloc)
-     {
--      if (!(__err & ios_base::failbit))
--	{
--	  char* __sanity;
--	  errno = 0;
--	  long double __ld = __strtold_l(__s, &__sanity, __cloc);
--          if (__sanity != __s && errno != ERANGE)
--	    __v = __ld;
--	  else
--	    __err |= ios_base::failbit;
--	}
-+      char* __sanity;
-+      errno = 0;
-+      long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+      if (__sanity != __s && errno != ERANGE)
-+	__v = __ld;
-+      else
-+	__err |= ios_base::failbit;
-     }
- 
-   void
-@@ -110,17 +101,18 @@
-   void
-   locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
-   {
--    if (_S_get_c_locale() != __cloc)
-+    if (__cloc && _S_get_c_locale() != __cloc)
-       __freelocale(__cloc);
-   }
- 
-   __c_locale
-   locale::facet::_S_clone_c_locale(__c_locale& __cloc)
-   { return __duplocale(__cloc); }
--} // namespace std
- 
--namespace __gnu_cxx
--{
-+_GLIBCXX_END_NAMESPACE
-+
-+_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-+
-   const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
-     {
-       "LC_CTYPE",
-@@ -138,9 +130,11 @@
-       "LC_IDENTIFICATION"
- #endif
-     };
--}
- 
--namespace std
--{
-+_GLIBCXX_END_NAMESPACE
-+
-+_GLIBCXX_BEGIN_NAMESPACE(std)
-+
-   const char* const* const locale::_S_categories = __gnu_cxx::category_names;
--}  // namespace std
-+
-+_GLIBCXX_END_NAMESPACE
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2008-09-17 22:35:28.000000000 -0700
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2008-09-17 23:09:49.000000000 -0700
-@@ -33,16 +33,20 @@
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
- 
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
- 
--namespace std
--{
-+_GLIBCXX_BEGIN_NAMESPACE(std)
-+
-   // NB: The other ctype<char> specializations are in src/locale.cc and
-   // various /config/os/* files.
--  template<>
-     ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
-     : ctype<char>(0, false, __refs)
-     {
-@@ -57,6 +61,8 @@
- #endif
- 	}
-     }
-+    ctype_byname<char>::~ctype_byname()
-+    { }
- 
- #ifdef _GLIBCXX_USE_WCHAR_T
-   ctype<wchar_t>::__wmask_type
-@@ -138,17 +144,33 @@
-   ctype<wchar_t>::
-   do_is(mask __m, wchar_t __c) const
-   {
--    // Highest bitmask in ctype_base == 10, but extra in "C"
--    // library for blank.
-+    // The case of __m == ctype_base::space is particularly important,
-+    // due to its use in many istream functions.  Therefore we deal with
-+    // it first, exploiting the knowledge that on GNU systems _M_bit[5]
-+    // is the mask corresponding to ctype_base::space.  NB: an encoding
-+    // change would not affect correctness!
-+
-     bool __ret = false;
--    const size_t __bitmasksize = 11;
--    for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
--      if (__m & _M_bit[__bitcur]
--	  && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
--	{
--	  __ret = true;
--	  break;
--	}
-+    if (__m == _M_bit[5])
-+      __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype);
-+    else
-+      {
-+	// Highest bitmask in ctype_base == 10, but extra in "C"
-+	// library for blank.
-+	const size_t __bitmasksize = 11;
-+	for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+	  if (__m & _M_bit[__bitcur])
-+	    {
-+	      if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+		{
-+		  __ret = true;
-+		  break;
-+		}
-+	      else if (__m == _M_bit[__bitcur])
-+		break;
-+	    }
-+      }
-+
-     return __ret;
-   }
- 
-@@ -290,4 +312,5 @@
- #endif
-   }
- #endif //  _GLIBCXX_USE_WCHAR_T
--}
-+
-+_GLIBCXX_END_NAMESPACE
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2008-09-17 22:35:28.000000000 -0700
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h	2008-09-17 23:13:34.000000000 -0700
-@@ -53,12 +53,16 @@
-   template<typename _CharT>
-      messages<_CharT>::messages(__c_locale __cloc, const char* __s,
- 				size_t __refs)
--     : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
--     _M_name_messages(__s)
-+     : facet(__refs), _M_c_locale_messages(NULL),
-+     _M_name_messages(NULL)
-      {
--       char* __tmp = new char[std::strlen(__s) + 1];
--       std::strcpy(__tmp, __s);
-+       const size_t __len = std::strlen(__s) + 1;
-+       char* __tmp = new char[__len];
-+       std::memcpy(__tmp, __s, __len);
-        _M_name_messages = __tmp;
-+
-+       // Last to avoid leaking memory if new throws.
-+       _M_c_locale_messages = _S_clone_c_locale(__cloc);
-      }
- 
-   template<typename _CharT>
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2008-09-17 22:35:28.000000000 -0700
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2008-09-17 22:35:29.000000000 -0700
-@@ -33,9 +33,14 @@
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
- 
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
- 
- #ifdef __UCLIBC_MJN3_ONLY__
-@@ -206,7 +211,7 @@
- 	  }
- 	break;
-       default:
--	;
-+	__ret = pattern();
-       }
-     return __ret;
-   }
-@@ -390,7 +395,9 @@
- 	  __c_locale __old = __uselocale(__cloc);
- #else
- 	  // Switch to named locale so that mbsrtowcs will work.
--	  char* __old = strdup(setlocale(LC_ALL, NULL));
-+  	  char* __old = setlocale(LC_ALL, NULL);
-+          const size_t __llen = strlen(__old) + 1;
-+          char* __sav = new char[__llen];
- 	  setlocale(LC_ALL, __name);
- #endif
- 
-@@ -477,8 +484,8 @@
- #ifdef __UCLIBC_HAS_XLOCALE__
- 	      __uselocale(__old);
- #else
--	      setlocale(LC_ALL, __old);
--	      free(__old);
-+	      setlocale(LC_ALL, __sav);
-+	      delete [] __sav;
- #endif
- 	      __throw_exception_again;
- 	    }
-@@ -498,8 +505,8 @@
- #ifdef __UCLIBC_HAS_XLOCALE__
- 	  __uselocale(__old);
- #else
--	  setlocale(LC_ALL, __old);
--	  free(__old);
-+	  setlocale(LC_ALL, __sav);
-+	  delete [] __sav;
- #endif
- 	}
-     }
-@@ -545,8 +552,11 @@
- 	  __c_locale __old = __uselocale(__cloc);
- #else
- 	  // Switch to named locale so that mbsrtowcs will work.
--	  char* __old = strdup(setlocale(LC_ALL, NULL));
--	  setlocale(LC_ALL, __name);
-+          char* __old = setlocale(LC_ALL, NULL);
-+          const size_t __llen = strlen(__old) + 1;
-+          char* __sav = new char[__llen];
-+          memcpy(__sav, __old, __llen);
-+          setlocale(LC_ALL, __name);
- #endif
- 
- #ifdef __UCLIBC_MJN3_ONLY__
-@@ -633,8 +643,8 @@
- #ifdef __UCLIBC_HAS_XLOCALE__
- 	      __uselocale(__old);
- #else
--	      setlocale(LC_ALL, __old);
--	      free(__old);
-+	      setlocale(LC_ALL, __sav);
-+	      delete [] __sav;
- #endif
-               __throw_exception_again;
- 	    }
-@@ -653,8 +663,8 @@
- #ifdef __UCLIBC_HAS_XLOCALE__
- 	  __uselocale(__old);
- #else
--	  setlocale(LC_ALL, __old);
--	  free(__old);
-+	  setlocale(LC_ALL, __sav);
-+	  delete [] __sav;
- #endif
- 	}
-     }
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2008-09-17 22:35:28.000000000 -0700
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2008-09-17 22:35:29.000000000 -0700
-@@ -33,9 +33,14 @@
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
- 
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
- 
- #ifdef __UCLIBC_MJN3_ONLY__
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h	2008-09-17 22:35:27.000000000 -0700
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h	2008-09-17 23:13:34.000000000 -0700
-@@ -50,12 +50,21 @@
-     __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
- 				     size_t __refs)
-     : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
--    _M_name_timepunct(__s)
-+    _M_name_timepunct(NULL)
-     {
--      char* __tmp = new char[std::strlen(__s) + 1];
--      std::strcpy(__tmp, __s);
-+      const size_t __len = std::strlen(__s) + 1;
-+      char* __tmp = new char[__len];
-+      std::memcpy(__tmp, __s, __len);
-       _M_name_timepunct = __tmp;
--      _M_initialize_timepunct(__cloc);
-+
-+      try
-+	{ _M_initialize_timepunct(__cloc); }
-+      catch(...)
-+	{
-+	  delete [] _M_name_timepunct;
-+	  __throw_exception_again;
-+	}
-+
-     }
- 
-   template<typename _CharT>
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/c_locale.h	2008-09-17 22:35:28.000000000 -0700
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h	2008-09-17 22:35:29.000000000 -0700
-@@ -39,21 +39,23 @@
- #pragma GCC system_header
- 
- #include <cstring>              // get std::strlen
--#include <cstdio>               // get std::snprintf or std::sprintf
-+#include <cstdio>               // get std::vsnprintf or std::vsprintf
- #include <clocale>
- #include <langinfo.h>		// For codecvt
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix this
- #endif
--#ifdef __UCLIBC_HAS_LOCALE__
-+#ifdef _GLIBCXX_USE_ICONV
- #include <iconv.h>		// For codecvt using iconv, iconv_t
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--#include <libintl.h> 		// For messages
-+#ifdef HAVE_LIBINTL_H
-+#include <libintl.h>		// For messages
- #endif
-+#include <cstdarg>
- 
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning what is _GLIBCXX_C_LOCALE_GNU for
-+// psm: used in os/gnu-linux/ctype_noninline.h
- #endif
- #define _GLIBCXX_C_LOCALE_GNU 1
- 
-@@ -78,23 +80,25 @@
- #else
-   typedef int*			__c_locale;
- #endif
--
--  // Convert numeric value of type _Tv to string and return length of
--  // string.  If snprintf is available use it, otherwise fall back to
--  // the unsafe sprintf which, in general, can be dangerous and should
-+  // Convert numeric value of type double to string and return length of
-+  // string.  If vsnprintf is available use it, otherwise fall back to
-+  // the unsafe vsprintf which, in general, can be dangerous and should
-   // be avoided.
--  template<typename _Tv>
--    int
--    __convert_from_v(char* __out,
--		     const int __size __attribute__ ((__unused__)),
--		     const char* __fmt,
--#ifdef __UCLIBC_HAS_XCLOCALE__
--		     _Tv __v, const __c_locale& __cloc, int __prec)
-+    inline int
-+    __convert_from_v(const __c_locale&
-+#ifndef __UCLIBC_HAS_XCLOCALE__
-+	__cloc __attribute__ ((__unused__))
-+#endif
-+		     ,
-+		     char* __out,
-+		     const int __size,
-+		     const char* __fmt, ...)
-     {
-+      va_list __args;
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+
-       __c_locale __old = __gnu_cxx::__uselocale(__cloc);
- #else
--		     _Tv __v, const __c_locale&, int __prec)
--    {
- # ifdef __UCLIBC_HAS_LOCALE__
-       char* __old = std::setlocale(LC_ALL, NULL);
-       char* __sav = new char[std::strlen(__old) + 1];
-@@ -103,7 +107,9 @@
- # endif
- #endif
- 
--      const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+      va_start(__args, __fmt);
-+      const int __ret = std::vsnprintf(__out, __size, __fmt, __args);
-+      va_end(__args);
- 
- #ifdef __UCLIBC_HAS_XCLOCALE__
-       __gnu_cxx::__uselocale(__old);
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/time_members.cc	2008-09-17 22:35:28.000000000 -0700
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc	2008-09-17 22:35:29.000000000 -0700
-@@ -53,11 +53,14 @@
-       const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
- 					_M_c_locale_timepunct);
- #else
--      char* __old = strdup(setlocale(LC_ALL, NULL));
-+      char* __old = setlocale(LC_ALL, NULL);
-+      const size_t __llen = strlen(__old) + 1;
-+      char* __sav = new char[__llen];
-+      memcpy(__sav, __old, __llen);
-       setlocale(LC_ALL, _M_name_timepunct);
-       const size_t __len = strftime(__s, __maxlen, __format, __tm);
--      setlocale(LC_ALL, __old);
--      free(__old);
-+      setlocale(LC_ALL, __sav);
-+      delete [] __sav;
- #endif
-       // Make sure __s is null terminated.
-       if (__len == 0)
-@@ -207,11 +210,14 @@
-       const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
- 					_M_c_locale_timepunct);
- #else
--      char* __old = strdup(setlocale(LC_ALL, NULL));
-+      char* __old = setlocale(LC_ALL, NULL);
-+      const size_t __llen = strlen(__old) + 1;
-+      char* __sav = new char[__llen];
-+      memcpy(__sav, __old, __llen);
-       setlocale(LC_ALL, _M_name_timepunct);
-       const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
--      setlocale(LC_ALL, __old);
--      free(__old);
-+      setlocale(LC_ALL, __sav);
-+      delete [] __sav;
- #endif
-       // Make sure __s is null terminated.
-       if (__len == 0)
-Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-===================================================================
---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	2008-09-17 22:35:28.000000000 -0700
-+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	2008-09-17 22:35:29.000000000 -0700
-@@ -31,6 +31,9 @@
- 
- #include <bits/c++config.h>
- #include <clocale>
-+#include <cstdlib>
-+#include <cstring>
-+#include <cstddef>
- 
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning clean this up
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/300-libstdc++-pic.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/300-libstdc++-pic.patch
deleted file mode 100644
index 89d03a8..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/300-libstdc++-pic.patch
+++ /dev/null
@@ -1,46 +0,0 @@ 
-# DP: Build and install libstdc++_pic.a library.
-
---- gcc-4.1.0/libstdc++-v3/src/Makefile.am	2004-11-15 17:33:05.000000000 -0600
-+++ gcc-4.1.0-patched/libstdc++-v3/src/Makefile.am	2005-04-25 20:05:59.186930896 -0500
-@@ -214,6 +214,10 @@
- 	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
- 
- 
-+install-exec-local:
-+	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
-+	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
---- gcc-4.1.0/libstdc++-v3/src/Makefile.in	2005-04-11 19:13:08.000000000 -0500
-+++ gcc-4.1.0-patched/libstdc++-v3/src/Makefile.in	2005-04-25 20:12:33.284316275 -0500
-@@ -627,7 +627,7 @@
- 
- install-data-am: install-data-local
- 
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
- 
- install-info: install-info-am
- 
-@@ -660,6 +660,7 @@
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
- 	install-data-am install-data-local install-exec \
-+	install-exec-local \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip install-toolexeclibLTLIBRARIES installcheck \
- 	installcheck-am installdirs maintainer-clean \
-@@ -745,6 +746,11 @@
- install_debug:
- 	(cd ${debugdir} && $(MAKE) \
- 	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
-+	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/301-missing-execinfo_h.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/301-missing-execinfo_h.patch
deleted file mode 100644
index 0e2092f..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@ 
---- gcc-4.0.0/boehm-gc/include/gc.h-orig	2005-04-28 22:28:57.000000000 -0500
-+++ gcc-4.0.0/boehm-gc/include/gc.h	2005-04-28 22:30:38.000000000 -0500
-@@ -500,7 +500,7 @@
- #ifdef __linux__
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/302-c99-snprintf.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/302-c99-snprintf.patch
deleted file mode 100644
index 0286586..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/302-c99-snprintf.patch
+++ /dev/null
@@ -1,13 +0,0 @@ 
-Index: gcc-4.3.1/libstdc++-v3/include/c_std/cstdio
-===================================================================
---- gcc-4.3.1.orig/libstdc++-v3/include/c_std/cstdio	2006-12-07 01:35:57.000000000 -0800
-+++ gcc-4.3.1/libstdc++-v3/include/c_std/cstdio	2008-08-16 02:11:37.000000000 -0700
-@@ -144,7 +144,7 @@
- 
- _GLIBCXX_END_NAMESPACE
- 
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/303-c99-complex-ugly-hack.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/303-c99-complex-ugly-hack.patch
deleted file mode 100644
index 2ccc80d..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/303-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,12 +0,0 @@ 
---- gcc-4.0.0/libstdc++-v3/configure-old	2005-04-30 22:04:48.061603912 -0500
-+++ gcc-4.0.0/libstdc++-v3/configure	2005-04-30 22:06:13.678588152 -0500
-@@ -7194,6 +7194,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/304-index_macro.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/304-index_macro.patch
deleted file mode 100644
index d8e4765..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/304-index_macro.patch
+++ /dev/null
@@ -1,24 +0,0 @@ 
---- gcc-4.1.0/libstdc++-v3/include/ext/rope.mps	2006-03-24 01:49:51 +0100
-+++ gcc-4.1.0/libstdc++-v3/include/ext/rope	2006-03-24 01:49:37 +0100
-@@ -59,6 +59,9 @@
- #include <bits/allocator.h>
- #include <ext/hash_fun.h>
- 
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- #   define __GC_CONST const
- # else
---- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps	2006-03-24 01:50:04 +0100
-+++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h	2006-03-24 01:50:28 +0100
-@@ -53,6 +53,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
- 
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
-   using std::size_t;
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/305-libmudflap-susv3-legacy.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/305-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 374b1f8..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/305-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,49 +0,0 @@ 
-Index: gcc-4.2/libmudflap/mf-hooks2.c
-===================================================================
---- gcc-4.2/libmudflap/mf-hooks2.c	(revision 119834)
-+++ gcc-4.2/libmudflap/mf-hooks2.c	(working copy)
-@@ -427,7 +427,7 @@
- {
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
--  bzero (s, n);
-+  memset (s, 0, n);
- }
- 
- 
-@@ -437,7 +437,7 @@
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
-   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
--  bcopy (src, dest, n);
-+  memmove (dest, src, n);
- }
- 
- 
-@@ -447,7 +447,7 @@
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
-   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
--  return bcmp (s1, s2, n);
-+  return n == 0 ? 0 : memcmp (s1, s2, n);
- }
- 
- 
-@@ -456,7 +456,7 @@
-   size_t n = strlen (s);
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
--  return index (s, c);
-+  return strchr (s, c);
- }
- 
- 
-@@ -465,7 +465,7 @@
-   size_t n = strlen (s);
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
--  return rindex (s, c);
-+  return strrchr (s, c);
- }
- 
- /* XXX:  stpcpy, memccpy */
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/306-libstdc++-namespace.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/306-libstdc++-namespace.patch
deleted file mode 100644
index 69587ca..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/306-libstdc++-namespace.patch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-12-22 13:06:56.000000000 +0100
-+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-12-22 15:23:41.000000000 +0100
-@@ -32,7 +32,8 @@
- //
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
-@@ -115,3 +116,4 @@
- 	   this->_S_create_c_locale(this->_M_c_locale_messages, __s); 
- 	 }
-      }
-+}
-diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h	2006-12-22 13:06:56.000000000 +0100
-+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h	2006-12-22 15:20:31.000000000 +0100
-@@ -33,7 +33,8 @@
- //
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
-   template<typename _CharT>
-     __timepunct<_CharT>::__timepunct(size_t __refs) 
-     : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
-@@ -74,3 +75,4 @@
-       delete _M_data; 
-       _S_destroy_c_locale(_M_c_locale_timepunct); 
-     }
-+}
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/307-locale_facets.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/307-locale_facets.patch
deleted file mode 100644
index 774fcfa..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/307-locale_facets.patch
+++ /dev/null
@@ -1,19 +0,0 @@ 
-This patch fixes a bug into ostream::operator<<(double) due to the wrong size
-passed into the __convert_from_v method. The wrong size is then passed to
-std::snprintf function, that, on uClibc, doens't handle sized 0 buffer.
-
-Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
-
-Index: gcc-4.3.1/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
---- gcc-4.3.1.orig/libstdc++-v3/include/bits/locale_facets.tcc	2007-11-26 17:59:41.000000000 -0800
-+++ gcc-4.3.1/libstdc++-v3/include/bits/locale_facets.tcc	2008-08-16 02:14:48.000000000 -0700
-@@ -1004,7 +1004,7 @@
- 	const int __cs_size = __fixed ? __max_exp + __prec + 4
- 	                              : __max_digits * 2 + __prec;
- 	char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
--	__len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, __fbuf, 
-+	__len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, __fbuf,
- 				      __prec, __v);
- #endif
- 
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/402-libbackend_dep_gcov-iov.h.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/402-libbackend_dep_gcov-iov.h.patch
deleted file mode 100644
index 0bf115c..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/402-libbackend_dep_gcov-iov.h.patch
+++ /dev/null
@@ -1,13 +0,0 @@ 
-Index: gcc-4.2/gcc/Makefile.in
-===================================================================
---- gcc-4.2/gcc/Makefile.in	(revision 121758)
-+++ gcc-4.2/gcc/Makefile.in	(working copy)
-@@ -2658,7 +2658,7 @@ mips-tdump.o : mips-tdump.c $(CONFIG_H) 
- # FIXME: writing proper dependencies for this is a *LOT* of work.
- libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
-   insn-config.h insn-flags.h insn-codes.h insn-constants.h \
--  insn-attr.h  $(DATESTAMP) $(BASEVER) $(DEVPHASE)
-+  insn-attr.h  $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h
- 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
- 	  -DTARGET_NAME=\"$(target_noncanonical)\" \
- 	  -DLOCALEDIR=\"$(localedir)\" \
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/602-sdk-libstdc++-includes.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/602-sdk-libstdc++-includes.patch
deleted file mode 100644
index 23fce75..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/602-sdk-libstdc++-includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@ 
---- gcc-4.1.0/libstdc++-v3/fragment.am	2005-03-21 11:40:14.000000000 -0600
-+++ gcc-4.1.0-patched/libstdc++-v3/fragment.am	2005-04-25 20:14:39.856251785 -0500
-@@ -21,5 +21,5 @@
- 	$(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
- 
- # -I/-D flags to pass when compiling.
--AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
-+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) -I$(toplevel_srcdir)/include
- 
---- gcc-4.1.0/libstdc++-v3/libmath/Makefile.am	2005-03-21 11:40:18.000000000 -0600
-+++ gcc-4.1.0-patched/libstdc++-v3/libmath/Makefile.am	2005-04-25 20:14:39.682280735 -0500
-@@ -35,7 +35,7 @@
- 
- libmath_la_SOURCES = stubs.c
- 
--AM_CPPFLAGS = $(CANADIAN_INCLUDES)
-+AM_CPPFLAGS = $(CANADIAN_INCLUDES) -I$(toplevel_srcdir)/include
- 
- # Only compiling "C" sources in this directory.
- LIBTOOL = @LIBTOOL@ --tag CC
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/64bithack.patch
deleted file mode 100644
index f6931b8..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/64bithack.patch
+++ /dev/null
@@ -1,33 +0,0 @@ 
-By default gcc places 64 bit libs in a lib64 directory. This makes it use 
-"lib" instead.
-
-RP 25/7/10
-
-Index: gcc-4.3.3/gcc/config/i386/t-linux64
-===================================================================
---- gcc-4.3.3.orig/gcc/config/i386/t-linux64	2007-09-27 20:56:06.000000000 +0100
-+++ gcc-4.3.3/gcc/config/i386/t-linux64	2010-08-03 12:55:04.642189070 +0100
-@@ -12,8 +12,8 @@
- # MULTILIB_OSDIRNAMES according to what is found on the target.
- 
- MULTILIB_OPTIONS = m64/m32
--MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_DIRNAMES = . 32 
-+MULTILIB_OSDIRNAMES = . $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
-Index: gcc-4.3.3/gcc/config/i386/linux64.h
-===================================================================
---- gcc-4.3.3.orig/gcc/config/i386/linux64.h	2007-08-02 11:49:31.000000000 +0100
-+++ gcc-4.3.3/gcc/config/i386/linux64.h	2010-08-03 13:01:51.621182117 +0100
-@@ -54,7 +54,7 @@
-    done.  */
-
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
-
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/740-sh-pr24836.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/740-sh-pr24836.patch
deleted file mode 100644
index 7992282..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/740-sh-pr24836.patch
+++ /dev/null
@@ -1,25 +0,0 @@ 
-http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24836
-
---- gcc/gcc/configure.ac	(revision 106699)
-+++ gcc/gcc/configure.ac	(working copy)
-@@ -2446,7 +2446,7 @@
- 	tls_first_minor=14
- 	tls_as_opt="-m64 -Aesame --fatal-warnings"
- 	;;
--  sh-*-* | sh[34]-*-*)
-+  sh-*-* | sh[34]*-*-*)
-     conftest_s='
- 	.section ".tdata","awT",@progbits
- foo:	.long	25
---- gcc/gcc/configure
-+++ gcc/gcc/configure
-@@ -14846,7 +14846,7 @@
- 	tls_first_minor=14
- 	tls_as_opt="-m64 -Aesame --fatal-warnings"
- 	;;
--  sh-*-* | sh[34]-*-*)
-+  sh-*-* | sh[34]*-*-*)
-     conftest_s='
- 	.section ".tdata","awT",@progbits
- foo:	.long	25
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/800-arm-bigendian.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/800-arm-bigendian.patch
deleted file mode 100644
index f433942..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/800-arm-bigendian.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
-Index: gcc-4.3.2/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.3.2.orig/gcc/config/arm/linux-elf.h	2007-11-08 05:44:09.000000000 -0800
-+++ gcc-4.3.2/gcc/config/arm/linux-elf.h	2008-08-28 21:08:30.000000000 -0700
-@@ -51,7 +51,7 @@
- 
- #undef  MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
--	{ "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+	{ "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
- 
- /* Now we define the strings used to build the spec file.  */
- #undef  LIB_SPEC
-Index: gcc-4.3.2/gcc/config.gcc
-===================================================================
---- gcc-4.3.2.orig/gcc/config.gcc	2008-08-28 20:57:39.000000000 -0700
-+++ gcc-4.3.2/gcc/config.gcc	2008-08-28 21:00:11.000000000 -0700
-@@ -742,6 +742,11 @@
- 	esac
- 	tmake_file="${tmake_file} t-linux arm/t-arm"
- 	case ${target} in
-+	arm*b-*)
-+		tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+		;;
-+	esac
-+	case ${target} in
- 	arm*-*-linux-*eabi)
- 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
- 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/801-arm-bigendian-eabi.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/801-arm-bigendian-eabi.patch
deleted file mode 100644
index 54490fc..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/801-arm-bigendian-eabi.patch
+++ /dev/null
@@ -1,14 +0,0 @@ 
-Index: gcc-4.1.1/gcc/config/arm/linux-eabi.h
-===================================================================
---- gcc-4.1.1.orig/gcc/config/arm/linux-eabi.h	2007-02-20 14:51:33.416193250 +0100
-+++ gcc-4.1.1/gcc/config/arm/linux-eabi.h	2007-02-20 14:52:11.622581000 +0100
-@@ -48,7 +48,8 @@
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- #undef SUBTARGET_EXTRA_LINK_SPEC
--#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
-+#define SUBTARGET_EXTRA_LINK_SPEC \
-+    " %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} "
- 
- /* Use ld-linux.so.3 so that it will be possible to run "classic"
-    GNU/Linux binaries on an EABI system.  */
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/904-flatten-switch-stmt-00.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/904-flatten-switch-stmt-00.patch
deleted file mode 100644
index 8fac37c..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/904-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,153 +0,0 @@ 
-Hi,
-
-The attached patch makes sure that we create smaller object code for
-simple switch statements. We just make sure to flatten the switch
-statement into an if-else chain, basically.
-
-This fixes a size-regression as compared to gcc-3.4, as can be seen
-below.
-
-2007-04-15  Bernhard Fischer  <..>
-
-	* stmt.c (expand_case): Do not create a complex binary tree when
-	optimizing for size but rather use the simple ordered list.
-	(emit_case_nodes): do not emit jumps to the default_label when
-	optimizing for size.
-
-Not regtested so far.
-Comments?
-
-Attached is the test switch.c mentioned below.
-
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i  -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i  -UCHAIN -Os -o switch-$i.o -c switch.c ;done
-
-$ size switch-*.o
-   text	   data	    bss	    dec	    hex	filename
-    169	      0	      0	    169	     a9	switch-2.95.o
-    115	      0	      0	    115	     73	switch-3.3.o
-    103	      0	      0	    103	     67	switch-3.4.o
-    124	      0	      0	    124	     7c	switch-4.0.o
-    124	      0	      0	    124	     7c	switch-4.1.o
-    124	      0	      0	    124	     7c	switch-4.2.orig-HEAD.o
-     95	      0	      0	     95	     5f	switch-4.3-HEAD.o
-    124	      0	      0	    124	     7c	switch-4.3.orig-HEAD.o
-    166	      0	      0	    166	     a6	switch-CHAIN-2.95.o
-    111	      0	      0	    111	     6f	switch-CHAIN-3.3.o
-     95	      0	      0	     95	     5f	switch-CHAIN-3.4.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.0.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.1.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.2.orig-HEAD.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.3-HEAD.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.3.orig-HEAD.o
-
-
-Content-Type: text/x-diff; charset=us-ascii
-Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
-
-Index: gcc-4.2.0/gcc/stmt.c
-===================================================================
---- gcc-4.2.0.orig/gcc/stmt.c	(revision 123843)
-+++ gcc-4.2.0/gcc/stmt.c	(working copy)
-@@ -2517,7 +2517,11 @@ expand_case (tree exp)
- 	  use_cost_table
- 	    = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- 	       && estimate_case_costs (case_list));
--	  balance_case_nodes (&case_list, NULL);
-+	  /* When optimizing for size, we want a straight list to avoid
-+	     jumps as much as possible. This basically creates an if-else
-+	     chain.  */
-+	  if (!optimize_size)
-+	    balance_case_nodes (&case_list, NULL);
- 	  emit_case_nodes (index, case_list, default_label, index_type);
- 	  emit_jump (default_label);
- 	}
-@@ -3075,6 +3079,7 @@ emit_case_nodes (rtx index, case_node_pt
- 	    {
- 	      if (!node_has_low_bound (node, index_type))
- 		{
-+		  if (!optimize_size) /* don't jl to the .default_label. */
- 		  emit_cmp_and_jump_insns (index,
- 					   convert_modes
- 					   (mode, imode,
-
-
-Content-Type: text/x-csrc; charset=us-ascii
-Content-Disposition: attachment; filename="switch.c"
-
-int
-commutative_tree_code (int code)
-{
-#define CASE(val, ret) case val:/* __asm__("# val="#val ",ret="#ret);*/ return ret;
-#ifndef CHAIN
-  switch (code)
-    {
-# if 1
-  CASE(1,3)
-  CASE(3,2)
-  CASE(5,8)
-  CASE(7,1)
-  CASE(33,4)
-  CASE(44,9)
-  CASE(55,10)
-  CASE(66,-1)
-  CASE(77,99)
-  CASE(666,0)
-# else
-    case 1:
-      return 3;
-    case 3:
-      return 2;
-    case 5:
-      return 8;
-    case 7:
-      return 1;
-    case 33:
-      return 4;
-    case 44:
-      return 9;
-    case 55:
-      return 10;
-    case 66:
-      return -1;
-    case 77:
-      return 99;
-    case 666:
-      return 0;
-# endif
-    default:
-      break;
-    }
-  return 4711;
-
-#else
-   if (code == 1)
-	return 3;
-  else if (code == 3)
-	return 2;
-  else if (code == 5)
-	return 8;
-  else if (code == 7)
-	return 1;
-  else if (code == 33)
-	return 4;
-  else if (code == 44)
-	return 9;
-  else if (code == 55)
-	return 10;
-  else if (code == 66)
-	return -1;
-  else if (code == 77)
-	return 99;
-  else if (code == 666)
-	return 0;
-  else
-	return 4711;
-#endif
-}
-
-
---AhhlLboLdkugWU4S--
-
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/arm-nolibfloat.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/arm-nolibfloat.patch
deleted file mode 100644
index c4897c0..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/arm-nolibfloat.patch
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# Dimitry Andric <dimitry@andric.com>, 2004-05-01
-#
-# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed
-#   anymore.  (The required functions are now in libgcc.)
-# 
-# Fixes errors like
-# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat
-# collect2: ld returned 1 exit status
-# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1
-# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat
-
-Index: gcc-4.0.2/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.0.2.orig/gcc/config/arm/linux-elf.h	2005-03-04 16:14:01.000000000 +0000
-+++ gcc-4.0.2/gcc/config/arm/linux-elf.h	2005-11-11 18:02:54.000000000 +0000
-@@ -56,7 +56,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- /* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
-    the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/arm-softfloat.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/arm-softfloat.patch
deleted file mode 100644
index 5e1edd9..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/arm-softfloat.patch
+++ /dev/null
@@ -1,16 +0,0 @@ 
-Index: gcc-4.0.2/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.0.2.orig/gcc/config/arm/t-linux	2004-05-15 12:41:35.000000000 +0000
-+++ gcc-4.0.2/gcc/config/arm/t-linux	2005-11-11 16:07:53.000000000 +0000
-@@ -4,7 +4,10 @@
- LIBGCC2_DEBUG_CFLAGS = -g0
- 
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
-+    _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+    _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+    _fixsfsi _fixunssfsi _floatdidf _floatdisf _floatundisf _floatundidf
- 
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/arm-thumb-cache.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/arm-thumb-cache.patch
deleted file mode 100644
index fa63846..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/arm-thumb-cache.patch
+++ /dev/null
@@ -1,29 +0,0 @@ 
---- gcc-4.1.1/gcc/config/arm/linux-gas.h-	2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.1.1/gcc/config/arm/linux-gas.h	2006-06-18 10:23:46.000000000 +0200
-@@ -44,6 +44,7 @@
- 
- /* Clear the instruction cache from `beg' to `end'.  This makes an
-    inline system call to SYS_cacheflush.  */
-+#if !defined(__thumb__)
- #define CLEAR_INSN_CACHE(BEG, END)					\
- {									\
-   register unsigned long _beg __asm ("a1") = (unsigned long) (BEG);	\
-@@ -53,3 +54,18 @@
- 		    : "=r" (_beg)					\
- 		    : "0" (_beg), "r" (_end), "r" (_flg));		\
- }
-+#else
-+#define CLEAR_INSN_CACHE(BEG, END)					\
-+{									\
-+  register unsigned long _beg __asm ("a1") = (unsigned long) (BEG);	\
-+  register unsigned long _end __asm ("a2") = (unsigned long) (END);	\
-+  register unsigned long _flg __asm ("a3") = 0;				\
-+  register unsigned long _swi __asm ("a4") = 0xf0002;			\
-+  __asm __volatile ("push      {r7}\n"                                 \
-+               "       mov     r7,a4\n"                                \
-+               "       swi     0       @ sys_cacheflush\n"             \
-+               "       pop     {r7}\n"                                 \
-+                   : "=r" (_beg)                                       \
-+                   : "0" (_beg), "r" (_end), "r" (_flg), "r" (_swi));  \
-+}
-+#endif
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/arm-thumb.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/arm-thumb.patch
deleted file mode 100644
index 7b0b8b2..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/arm-thumb.patch
+++ /dev/null
@@ -1,43 +0,0 @@ 
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: gcc-4.3.1/gcc/config/arm/lib1funcs.asm
-===================================================================
---- gcc-4.3.1.orig/gcc/config/arm/lib1funcs.asm	2007-05-30 12:04:09.000000000 -0700
-+++ gcc-4.3.1/gcc/config/arm/lib1funcs.asm	2008-08-28 21:51:17.000000000 -0700
-@@ -1225,11 +1225,12 @@
-    code here switches to the correct mode before executing the function.  */
- 	
- 	.text
--	.align 0
-+	.align 1
-         .force_thumb
- 
- .macro call_via register
- 	THUMB_FUNC_START _call_via_\register
-+       .hidden SYM (_call_via_\register)
- 
- 	bx	\register
- 	nop
-@@ -1330,6 +1331,7 @@
- 	.code	16
- 
- 	THUMB_FUNC_START _interwork_call_via_\register
-+       .hidden SYM (_interwork_call_via_\register)
- 
- 	bx	pc
- 	nop
-Index: gcc-4.3.1/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.3.1.orig/gcc/config/arm/t-linux	2008-08-28 21:25:24.000000000 -0700
-+++ gcc-4.3.1/gcc/config/arm/t-linux	2008-08-28 21:51:17.000000000 -0700
-@@ -6,6 +6,7 @@
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
-     _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-     _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+    _call_via_rX \
-     _fixsfsi _fixunssfsi _floatdidf _floatdisf _floatundisf _floatundidf
- 
- # MULTILIB_OPTIONS = mhard-float/msoft-float
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/cache-amnesia.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/cache-amnesia.patch
deleted file mode 100644
index fb4d1a2..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/cache-amnesia.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
----
- gcc/configure    |    2 +-
- gcc/configure.ac |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: gcc-4.3.1/gcc/configure
-===================================================================
---- gcc-4.3.1.orig/gcc/configure	2008-08-20 00:27:57.000000000 -0700
-+++ gcc-4.3.1/gcc/configure	2008-08-20 00:45:11.000000000 -0700
-@@ -12813,7 +12813,7 @@ else
- 	esac
- 	saved_CFLAGS="${CFLAGS}"
- 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
--	${realsrcdir}/configure \
-+	CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
- 		--enable-languages=${enable_languages-all} \
- 		--target=$target_alias --host=$build_alias --build=$build_alias
- 	CFLAGS="${saved_CFLAGS}"
-Index: gcc-4.3.1/gcc/configure.ac
-===================================================================
---- gcc-4.3.1.orig/gcc/configure.ac	2008-08-20 00:27:57.000000000 -0700
-+++ gcc-4.3.1/gcc/configure.ac	2008-08-20 00:44:52.000000000 -0700
-@@ -1480,7 +1480,7 @@ else
- 	esac
- 	saved_CFLAGS="${CFLAGS}"
- 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
--	${realsrcdir}/configure \
-+	CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
- 		--enable-languages=${enable_languages-all} \
- 		--target=$target_alias --host=$build_alias --build=$build_alias
- 	CFLAGS="${saved_CFLAGS}"
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/debian/arm-unbreak-eabi-armv4t.dpatch b/meta/recipes-devtools/gcc/gcc-4.3.3/debian/arm-unbreak-eabi-armv4t.dpatch
deleted file mode 100644
index 7bb8887..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/debian/arm-unbreak-eabi-armv4t.dpatch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-#! /bin/sh -e
-
-# DP: Fix armv4t build on ARM
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p1 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- src/gcc/config/arm/linux-eabi.h.orig	2007-11-24 12:37:38.000000000 +0000
-+++ src/gcc/config/arm/linux-eabi.h	2007-11-24 12:39:41.000000000 +0000
-@@ -44,7 +44,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/debian/gcc-ice-hack.dpatch b/meta/recipes-devtools/gcc/gcc-4.3.3/debian/gcc-ice-hack.dpatch
deleted file mode 100644
index 84c5ef2..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/debian/gcc-ice-hack.dpatch
+++ /dev/null
@@ -1,331 +0,0 @@ 
-#! /bin/sh -e
-
-# DP: Retry the build on an ice, save the calling options and preprocessed
-# DP: source when the ice is reproducible.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
-2004-01-23  Jakub Jelinek  <jakub@redhat.com>
-
-	* system.h (ICE_EXIT_CODE): Define.
-	* gcc.c (execute): Don't free first string early, but at the end
-	of the function.  Call retry_ice if compiler exited with
-	ICE_EXIT_CODE.
-	(retry_ice): New function.
-	* diagnostic.c (diagnostic_count_diagnostic,
-	diagnostic_action_after_output, error_recursion): Exit with
-	ICE_EXIT_CODE instead of FATAL_EXIT_CODE.
-
---- gcc/diagnostic.c.orig	2007-09-30 10:48:13.000000000 +0000
-+++ gcc/diagnostic.c	2007-09-30 10:49:57.000000000 +0000
-@@ -244,7 +244,7 @@
-       fnotice (stderr, "Please submit a full bug report,\n"
- 	       "with preprocessed source if appropriate.\n"
- 	       "See %s for instructions.\n", bug_report_url);
--      exit (ICE_EXIT_CODE);
-+      exit (FATAL_EXIT_CODE);
- 
-     case DK_FATAL:
-       if (context->abort_on_error)
---- gcc/gcc.c.orig	2007-09-30 10:48:13.000000000 +0000
-+++ gcc/gcc.c	2007-09-30 10:48:39.000000000 +0000
-@@ -357,6 +357,9 @@
- #if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX)
- static const char *convert_filename (const char *, int, int);
- #endif
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS))
-+static void retry_ice (const char *prog, const char **argv);
-+#endif
- 
- static const char *getenv_spec_function (int, const char **);
- static const char *if_exists_spec_function (int, const char **);
-@@ -2999,7 +3002,7 @@
- 	    }
- 	}
- 
--      if (string != commands[i].prog)
-+      if (i && string != commands[i].prog)
- 	free (CONST_CAST (char *, string));
-     }
- 
-@@ -3056,6 +3059,16 @@
- 	else if (WIFEXITED (status)
- 		 && WEXITSTATUS (status) >= MIN_FATAL_STATUS)
- 	  {
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS))
-+	    /* For ICEs in cc1, cc1obj, cc1plus see if it is
-+	       reproducible or not.  */
-+	    char *p;
-+	    if (WEXITSTATUS (status) == ICE_EXIT_CODE
-+		&& i == 0
-+		&& (p = strrchr (commands[0].argv[0], DIR_SEPARATOR))
-+		&& ! strncmp (p + 1, "cc1", 3))
-+	      retry_ice (commands[0].prog, commands[0].argv);
-+#endif
- 	    if (WEXITSTATUS (status) > greatest_status)
- 	      greatest_status = WEXITSTATUS (status);
- 	    ret_code = -1;
-@@ -3076,6 +3089,9 @@
- 	  }
-       }
- 
-+    if (commands[0].argv[0] != commands[0].prog)
-+      free ((PTR) commands[0].argv[0]);
-+
-     return ret_code;
-   }
- }
-@@ -6016,6 +6032,224 @@
-   switches[switchnum].validated = 1;
- }
- 
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS))
-+#define RETRY_ICE_ATTEMPTS 2
-+
-+static void
-+retry_ice (const char *prog, const char **argv)
-+{
-+  int nargs, out_arg = -1, quiet = 0, attempt;
-+  int pid, retries, sleep_interval;
-+  const char **new_argv;
-+  char *temp_filenames[RETRY_ICE_ATTEMPTS * 2 + 2];
-+
-+  if (input_filename == NULL || ! strcmp (input_filename, "-"))
-+    return;
-+
-+  for (nargs = 0; argv[nargs] != NULL; ++nargs)
-+    /* Only retry compiler ICEs, not preprocessor ones.  */
-+    if (! strcmp (argv[nargs], "-E"))
-+      return;
-+    else if (argv[nargs][0] == '-' && argv[nargs][1] == 'o')
-+      {
-+	if (out_arg == -1)
-+	  out_arg = nargs;
-+	else
-+	  return;
-+      }
-+    /* If the compiler is going to output any time information,
-+       it might vary between invocations.  */
-+    else if (! strcmp (argv[nargs], "-quiet"))
-+      quiet = 1;
-+    else if (! strcmp (argv[nargs], "-ftime-report"))
-+      return;
-+
-+  if (out_arg == -1 || !quiet)
-+    return;
-+
-+  memset (temp_filenames, '\0', sizeof (temp_filenames));
-+  new_argv = alloca ((nargs + 3) * sizeof (const char *));
-+  memcpy (new_argv, argv, (nargs + 1) * sizeof (const char *));
-+  new_argv[nargs++] = "-frandom-seed=0";
-+  new_argv[nargs] = NULL;
-+  if (new_argv[out_arg][2] == '\0')
-+    new_argv[out_arg + 1] = "-";
-+  else
-+    new_argv[out_arg] = "-o-";
-+
-+  for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS + 1; ++attempt)
-+    {
-+      int fd = -1;
-+      int status;
-+
-+      temp_filenames[attempt * 2] = make_temp_file (".out");
-+      temp_filenames[attempt * 2 + 1] = make_temp_file (".err");
-+
-+      if (attempt == RETRY_ICE_ATTEMPTS)
-+        {
-+	  int i;
-+	  int fd1, fd2;
-+	  struct stat st1, st2;
-+	  size_t n, len;
-+	  char *buf;
-+
-+	  buf = xmalloc (8192);
-+
-+	  for (i = 0; i < 2; ++i)
-+	    {
-+	      fd1 = open (temp_filenames[i], O_RDONLY);
-+	      fd2 = open (temp_filenames[2 + i], O_RDONLY);
-+
-+	      if (fd1 < 0 || fd2 < 0)
-+		{
-+		  i = -1;
-+		  close (fd1);
-+		  close (fd2);
-+		  break;
-+		}
-+
-+	      if (fstat (fd1, &st1) < 0 || fstat (fd2, &st2) < 0)
-+		{
-+		  i = -1;
-+		  close (fd1);
-+		  close (fd2);
-+		  break;
-+		}
-+
-+	      if (st1.st_size != st2.st_size)
-+		{
-+		  close (fd1);
-+		  close (fd2);
-+		  break;
-+		}
-+
-+	      len = 0;
-+	      for (n = st1.st_size; n; n -= len)
-+		{
-+		  len = n;
-+		  if (len > 4096)
-+		    len = 4096;
-+
-+		  if (read (fd1, buf, len) != (int) len
-+		      || read (fd2, buf + 4096, len) != (int) len)
-+		    {
-+		      i = -1;
-+		      break;
-+		    }
-+
-+		  if (memcmp (buf, buf + 4096, len) != 0)
-+		    break;
-+		}
-+
-+	      close (fd1);
-+	      close (fd2);
-+
-+	      if (n)
-+		break;
-+	    }
-+
-+	  free (buf);
-+	  if (i == -1)
-+	    break;
-+
-+	  if (i != 2)
-+	    {
-+	      notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n");
-+	      break;
-+	    }
-+
-+          fd = open (temp_filenames[attempt * 2], O_RDWR);
-+	  if (fd < 0)
-+	    break;
-+	  write (fd, "//", 2);
-+	  for (i = 0; i < nargs; i++)
-+	    {
-+	      write (fd, " ", 1);
-+	      write (fd, new_argv[i], strlen (new_argv[i]));
-+	    }
-+	  write (fd, "\n", 1);
-+	  new_argv[nargs] = "-E";
-+	  new_argv[nargs + 1] = NULL;
-+        }
-+
-+      /* Fork a subprocess; wait and retry if it fails.  */
-+      sleep_interval = 1;
-+      pid = -1;
-+      for (retries = 0; retries < 4; retries++)
-+	{
-+	  pid = fork ();
-+	  if (pid >= 0)
-+	    break;
-+	  sleep (sleep_interval);
-+	  sleep_interval *= 2;
-+	}
-+
-+      if (pid < 0)
-+	break;
-+      else if (pid == 0)
-+	{
-+	  if (attempt != RETRY_ICE_ATTEMPTS)
-+	    fd = open (temp_filenames[attempt * 2], O_RDWR);
-+	  if (fd < 0)
-+	    exit (-1);
-+	  if (fd != 1)
-+	    {
-+	      close (1);
-+	      dup (fd);
-+	      close (fd);
-+	    }
-+
-+	  fd = open (temp_filenames[attempt * 2 + 1], O_RDWR);
-+	  if (fd < 0)
-+	    exit (-1);
-+	  if (fd != 2)
-+	    {
-+	      close (2);
-+	      dup (fd);
-+	      close (fd);
-+	    }
-+
-+	  if (prog == new_argv[0])
-+	    execvp (prog, (char *const *) new_argv);
-+	  else
-+	    execv (new_argv[0], (char *const *) new_argv);
-+	  exit (-1);
-+	}
-+
-+      if (waitpid (pid, &status, 0) < 0)
-+	break;
-+
-+      if (attempt < RETRY_ICE_ATTEMPTS
-+	  && (! WIFEXITED (status) || WEXITSTATUS (status) != ICE_EXIT_CODE))
-+	{
-+	  notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n");
-+	  break;
-+	}
-+      else if (attempt == RETRY_ICE_ATTEMPTS)
-+	{
-+	  close (fd);
-+	  if (WIFEXITED (status)
-+	      && WEXITSTATUS (status) == SUCCESS_EXIT_CODE)
-+	    {
-+	      notice ("Preprocessed source stored into %s file, please attach this to your bugreport.\n",
-+		      temp_filenames[attempt * 2]);
-+	      /* Make sure it is not deleted.  */
-+	      free (temp_filenames[attempt * 2]);
-+	      temp_filenames[attempt * 2] = NULL;
-+	      break;
-+	    }
-+	}
-+    }
-+
-+  for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS * 2 + 2; attempt++)
-+    if (temp_filenames[attempt])
-+      {
-+	unlink (temp_filenames[attempt]);
-+	free (temp_filenames[attempt]);
-+      }
-+}
-+#endif
-+
- /* Search for a file named NAME trying various prefixes including the
-    user's -B prefix and some standard ones.
-    Return the absolute file name found.  If nothing is found, return NAME.  */
---- gcc/Makefile.in.orig	2007-09-30 10:48:13.000000000 +0000
-+++ gcc/Makefile.in	2007-09-30 10:48:39.000000000 +0000
-@@ -192,6 +192,7 @@
- build/gengtype-lex.o-warn = -Wno-error
- # SYSCALLS.c misses prototypes
- SYSCALLS.c.X-warn = -Wno-strict-prototypes -Wno-error
-+build/gcc.o-warn = -Wno-error
- 
- # All warnings have to be shut off in stage1 if the compiler used then
- # isn't gcc; configure determines that.  WARN_CFLAGS will be either
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/debian/libstdc++-pic.dpatch b/meta/recipes-devtools/gcc/gcc-4.3.3/debian/libstdc++-pic.dpatch
deleted file mode 100644
index 70c9e81..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/debian/libstdc++-pic.dpatch
+++ /dev/null
@@ -1,71 +0,0 @@ 
-#! /bin/sh -e
-
-# DP: Build and install libstdc++_pic.a library.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
-diff -ur libstdc++-v3/src/Makefile.am libstdc++-v3/src/Makefile.am
---- libstdc++-v3/src/Makefile.am~	2004-04-16 21:04:05.000000000 +0200
-+++ libstdc++-v3/src/Makefile.am	2004-07-03 20:22:43.000000000 +0200
-@@ -210,6 +210,10 @@
- 	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
- 
- 
-+install-exec-local:
-+	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o || touch libstdc++_pic.a
-+	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -ur libstdc++-v3/src/Makefile.in libstdc++-v3/src/Makefile.in
---- libstdc++-v3/src/Makefile.in	2004-07-03 06:41:13.000000000 +0200
-+++ libstdc++-v3/src/Makefile.in	2004-07-03 20:25:05.000000000 +0200
-@@ -611,7 +611,7 @@
- 
- install-data-am: install-data-local
- 
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
- 
- install-info: install-info-am
- 
-@@ -644,6 +644,7 @@
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
- 	install-data-am install-data-local install-exec \
-+	install-exec-local \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip install-toolexeclibLTLIBRARIES installcheck \
- 	installcheck-am installdirs maintainer-clean \
-@@ -729,6 +730,11 @@
- install_debug:
- 	(cd ${debugdir} && $(MAKE) \
- 	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o || touch libstdc++_pic.a
-+	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/debian/pr30961.dpatch b/meta/recipes-devtools/gcc/gcc-4.3.3/debian/pr30961.dpatch
deleted file mode 100644
index b20fdf5..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/debian/pr30961.dpatch
+++ /dev/null
@@ -1,179 +0,0 @@ 
-#! /bin/sh -e
-
-# DP: <your description>
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
-From: "H.J. Lu" <hjl@lucon.org>
-Sender: gcc-patches-owner@gcc.gnu.org
-To: gcc-patches@gcc.gnu.org
-Subject: PATCH: PR target/30961: [4.1/4.2/4.3 regression] redundant reg/mem 	stores/moves
-Date: Mon, 27 Aug 2007 11:34:12 -0700
-
-We start with
-
-(note:HI 3 4 22 2 NOTE_INSN_FUNCTION_BEG)
-
-(insn:HI 6 3 10 2 c.c:3 (set (reg:DF 58 [ <result> ])
-        (subreg:DF (reg/v:DI 59 [ in ]) 0)) 102 {*movdf_integer_rex64} (expr_list:REG_DEAD (reg/v:DI 59 [ in ])
-        (nil)))
-
-(insn:HI 10 6 16 2 c.c:7 (set (reg/i:DF 21 xmm0 [ <result> ])
-        (reg:DF 58 [ <result> ])) 102 {*movdf_integer_rex64} (expr_list:REG_DEAD (reg:DF 58 [ <result> ])
-        (nil)))
-
-(insn:HI 16 10 0 2 c.c:7 (use (reg/i:DF 21 xmm0 [ <result> ])) -1 (nil))
-
-we are trying to allocate registers for insn 6 and we allocate
-xmm0 for the return value. Reload doesn't check if xmm0 can be used for
-DF 59, it allocates xmm1 for DF 59 and generates:
-
-Reloads for insn # 6
-Reload 0: reload_in (DF) = (reg:DF 5 di)
-        SSE_REGS, RELOAD_FOR_INPUT (opnum = 1), can't combine
-        reload_in_reg: (subreg:DF (reg/v:DI 5 di [orig:59 in ] [59]) 0)
-        reload_reg_rtx: (reg:DF 22 xmm1)
-...
-
-(note:HI 4 1 3 2 [bb 2] NOTE_INSN_BASIC_BLOCK)
-
-(note:HI 3 4 22 2 NOTE_INSN_FUNCTION_BEG)
-
-(insn 22 3 23 2 c.c:3 (set (mem/c:DF (plus:DI (reg/f:DI 7 sp)
-                (const_int -8 [0xfffffffffffffff8])) [0 S8 A8])
-        (reg:DF 5 di)) 102 {*movdf_integer_rex64} (nil))
-
-(insn 23 22 6 2 c.c:3 (set (reg:DF 22 xmm1)
-        (mem/c:DF (plus:DI (reg/f:DI 7 sp)
-                (const_int -8 [0xfffffffffffffff8])) [0 S8 A8])) 102 {*movdf_integer_rex64} (nil))
-
-(insn:HI 6 23 16 2 c.c:3 (set (reg:DF 21 xmm0 [orig:58 <result> ] [58])
-        (reg:DF 22 xmm1)) 102 {*movdf_integer_rex64} (nil))
-
-(insn 16 6 21 2 c.c:7 (use (reg/i:DF 21 xmm0 [ <result> ])) -1 (nil))
-
-This patch tries to use the destination register when reloading for input. It
-generates
-
-Reloads for insn # 6
-Reload 0: reload_in (DF) = (reg:DF 5 di)
-        SSE_REGS, RELOAD_FOR_INPUT (opnum = 1), can't combine
-        reload_in_reg: (subreg:DF (reg/v:DI 5 di [orig:59 in ] [59]) 0)
-        reload_reg_rtx: (reg:DF 21 xmm0)
-...
-(note:HI 4 1 3 2 [bb 2] NOTE_INSN_BASIC_BLOCK)
-
-(note:HI 3 4 22 2 NOTE_INSN_FUNCTION_BEG)
-
-(insn 22 3 23 2 c.c:3 (set (mem/c:DF (plus:DI (reg/f:DI 7 sp)
-                (const_int -8 [0xfffffffffffffff8])) [0 S8 A8])
-        (reg:DF 5 di)) 102 {*movdf_integer_rex64} (nil))
-
-(insn 23 22 6 2 c.c:3 (set (reg:DF 21 xmm0)
-        (mem/c:DF (plus:DI (reg/f:DI 7 sp)
-                (const_int -8 [0xfffffffffffffff8])) [0 S8 A8])) 102 {*movdf_integer_rex64} (nil))
-
-(insn:HI 6 23 10 2 c.c:3 (set (reg:DF 22 xmm1 [orig:58 <result> ] [58])
-        (reg:DF 21 xmm0)) 102 {*movdf_integer_rex64} (nil))
-
-(insn:HI 10 6 16 2 c.c:7 (set (reg/i:DF 21 xmm0 [ <result> ])
-        (reg:DF 22 xmm1 [orig:58 <result> ] [58])) 102 {*movdf_integer_rex64} (nil))
-
-(insn 16 10 21 2 c.c:7 (use (reg/i:DF 21 xmm0 [ <result> ])) -1 (nil))
-
-
-H.J.
-----
-gcc/
-
-2007-08-27  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/30961
-	* reload1.c (find_reg): Favor the hard register in destination
-	if it is usable and a memory location is needed for reload
-	input.
-
-gcc/testsuite/
-
-2007-08-27  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/30961
-	* gcc.target/i386/pr30961-1.c: New.
-
---- gcc/reload1.c.second	2007-08-27 09:35:08.000000000 -0700
-+++ gcc/reload1.c	2007-08-27 09:36:33.000000000 -0700
-@@ -1781,6 +1781,20 @@ find_reg (struct insn_chain *chain, int 
-   HARD_REG_SET not_usable;
-   HARD_REG_SET used_by_other_reload;
-   reg_set_iterator rsi;
-+#ifdef SECONDARY_MEMORY_NEEDED
-+  rtx body = PATTERN (chain->insn);
-+  unsigned int dest_reg = FIRST_PSEUDO_REGISTER;
-+
-+  if (GET_CODE (body) == SET)
-+    {
-+      rtx dest = SET_DEST (body);
-+
-+      if ((REG_P (dest)
-+	   || (GET_CODE (dest) == SUBREG
-+	       && REG_P (SUBREG_REG (dest)))))
-+	dest_reg = reg_or_subregno (dest);
-+    }
-+#endif
- 
-   COPY_HARD_REG_SET (not_usable, bad_spill_regs);
-   IOR_HARD_REG_SET (not_usable, bad_spill_regs_global);
-@@ -1821,6 +1835,18 @@ find_reg (struct insn_chain *chain, int 
- 	    this_cost--;
- 	  if (rl->out && REG_P (rl->out) && REGNO (rl->out) == regno)
- 	    this_cost--;
-+#ifdef SECONDARY_MEMORY_NEEDED
-+	  /* If a memory location is needed for rl->in and dest_reg
-+	     is usable, we will favor it.  */
-+	  else if (dest_reg == regno
-+		   && rl->in
-+		   && REG_P (rl->in)
-+		   && REGNO (rl->in) < FIRST_PSEUDO_REGISTER
-+		   && SECONDARY_MEMORY_NEEDED (REGNO_REG_CLASS (REGNO (rl->in)),
-+					       rl->class,
-+					       rl->mode))
-+	    this_cost = 0;
-+#endif
- 	  if (this_cost < best_cost
- 	      /* Among registers with equal cost, prefer caller-saved ones, or
- 		 use REG_ALLOC_ORDER if it is defined.  */
---- gcc/testsuite/gcc.target/i386/pr30961-1.c.second	2007-08-27 11:01:59.000000000 -0700
-+++ gcc/testsuite/gcc.target/i386/pr30961-1.c	2007-08-27 11:02:51.000000000 -0700
-@@ -0,0 +1,13 @@
-+/* { dg-do compile } */
-+/* { dg-require-effective-target lp64 } */
-+/* { dg-options "-O2" } */
-+
-+double
-+convert (long long in)
-+{
-+  double f;
-+  __builtin_memcpy( &f, &in, sizeof( in ) );
-+  return f;
-+}
-+
-+/* { dg-final { scan-assembler-not "movapd" } } */
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-c++-builtin-redecl.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-c++-builtin-redecl.patch
deleted file mode 100644
index 77655ad..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-c++-builtin-redecl.patch
+++ /dev/null
@@ -1,102 +0,0 @@ 
-2007-10-02  Jakub Jelinek  <jakub@redhat.com>
-
-	* decl.c (duplicate_decls): When redeclaring a builtin function,
-	keep the merged decl builtin whenever types match, even if new
-	decl defines a function.
-
-	* gcc.dg/builtins-65.c: New test.
-	* g++.dg/ext/builtin10.C: New test.
-
---- gcc/cp/decl.c.jj	2007-10-01 22:11:09.000000000 +0200
-+++ gcc/cp/decl.c	2007-10-02 11:39:46.000000000 +0200
-@@ -1988,23 +1988,21 @@ duplicate_decls (tree newdecl, tree oldd
- 	  DECL_ARGUMENTS (olddecl) = DECL_ARGUMENTS (newdecl);
- 	  DECL_RESULT (olddecl) = DECL_RESULT (newdecl);
- 	}
-+      /* If redeclaring a builtin function, it stays built in.  */
-+      if (types_match && DECL_BUILT_IN (olddecl))
-+	{
-+	  DECL_BUILT_IN_CLASS (newdecl) = DECL_BUILT_IN_CLASS (olddecl);
-+	  DECL_FUNCTION_CODE (newdecl) = DECL_FUNCTION_CODE (olddecl);
-+	  /* If we're keeping the built-in definition, keep the rtl,
-+	     regardless of declaration matches.  */
-+	  COPY_DECL_RTL (olddecl, newdecl);
-+	}
-       if (new_defines_function)
- 	/* If defining a function declared with other language
- 	   linkage, use the previously declared language linkage.  */
- 	SET_DECL_LANGUAGE (newdecl, DECL_LANGUAGE (olddecl));
-       else if (types_match)
- 	{
--	  /* If redeclaring a builtin function, and not a definition,
--	     it stays built in.  */
--	  if (DECL_BUILT_IN (olddecl))
--	    {
--	      DECL_BUILT_IN_CLASS (newdecl) = DECL_BUILT_IN_CLASS (olddecl);
--	      DECL_FUNCTION_CODE (newdecl) = DECL_FUNCTION_CODE (olddecl);
--	      /* If we're keeping the built-in definition, keep the rtl,
--		 regardless of declaration matches.  */
--	      COPY_DECL_RTL (olddecl, newdecl);
--	    }
--
- 	  DECL_RESULT (newdecl) = DECL_RESULT (olddecl);
- 	  /* Don't clear out the arguments if we're redefining a function.  */
- 	  if (DECL_ARGUMENTS (olddecl))
---- gcc/testsuite/gcc.dg/builtins-65.c.jj	2007-10-02 11:23:51.000000000 +0200
-+++ gcc/testsuite/gcc.dg/builtins-65.c	2007-10-02 11:24:12.000000000 +0200
-@@ -0,0 +1,25 @@
-+/* { dg-do compile } */
-+/* { dg-options "-O2" } */
-+
-+typedef __SIZE_TYPE__ size_t;
-+extern void __chk_fail (void);
-+extern int snprintf (char *, size_t, const char *, ...);
-+extern inline __attribute__((gnu_inline, always_inline)) int snprintf (char *a, size_t b, const char *fmt, ...)
-+{
-+  if (__builtin_object_size (a, 0) != -1UL && __builtin_object_size (a, 0) < b)
-+    __chk_fail ();
-+  return __builtin_snprintf (a, b, fmt, __builtin_va_arg_pack ());
-+}
-+extern int snprintf (char *, size_t, const char *, ...) __asm ("mysnprintf");
-+
-+char buf[10];
-+
-+int
-+main (void)
-+{
-+  snprintf (buf, 10, "%d%d\n", 10, 10);
-+  return 0;
-+}
-+
-+/* { dg-final { scan-assembler "mysnprintf" } } */
-+/* { dg-final { scan-assembler-not "__chk_fail" } } */
---- gcc/testsuite/g++.dg/ext/builtin10.C.jj	2007-10-02 11:19:45.000000000 +0200
-+++ gcc/testsuite/g++.dg/ext/builtin10.C	2007-10-02 11:23:26.000000000 +0200
-@@ -0,0 +1,27 @@
-+// { dg-do compile }
-+// { dg-options "-O2" }
-+
-+typedef __SIZE_TYPE__ size_t;
-+extern "C" {
-+extern void __chk_fail (void);
-+extern int snprintf (char *, size_t, const char *, ...);
-+extern inline __attribute__((gnu_inline, always_inline)) int snprintf (char *a, size_t b, const char *fmt, ...)
-+{
-+  if (__builtin_object_size (a, 0) != -1UL && __builtin_object_size (a, 0) < b)
-+    __chk_fail ();
-+  return __builtin_snprintf (a, b, fmt, __builtin_va_arg_pack ());
-+}
-+extern int snprintf (char *, size_t, const char *, ...) __asm ("mysnprintf");
-+}
-+
-+char buf[10];
-+
-+int
-+main (void)
-+{
-+  snprintf (buf, 10, "%d%d\n", 10, 10);
-+  return 0;
-+}
-+
-+// { dg-final { scan-assembler "mysnprintf" } }
-+// { dg-final { scan-assembler-not "__chk_fail" } }
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-cpp-pragma.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-cpp-pragma.patch
deleted file mode 100644
index 00d37bd..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-cpp-pragma.patch
+++ /dev/null
@@ -1,284 +0,0 @@ 
-2008-02-26  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-ppoutput.c (scan_translation_unit): Handle CPP_PRAGMA
-	and CPP_PRAGMA_EOL.
-	* c-pragma.c (pragma_ns_name): New typedef.
-	(registered_pp_pragmas): New variable.
-	(c_pp_lookup_pragma): New function.
-	(c_register_pragma_1): If flag_preprocess_only, do nothing
-	for non-expanded pragmas, for expanded ones push pragma's
-	namespace and name into registered_pp_pragmas vector.
-	(c_invoke_pragma_handler): Register OpenMP pragmas even when
-	flag_preprocess_only, don't register GCC pch_preprocess
-	pragma if flag_preprocess_only.
-	* c-opts.c (c_common_init): Call init_pragma even if
-	flag_preprocess_only.
-	* c-pragma.c (c_pp_lookup_pragma): New prototype.
-	* config/darwin.h (DARWIN_REGISTER_TARGET_PRAGMAS): Don't call
-	cpp_register_pragma if flag_preprocess_only.
-
-	* gcc.dg/gomp/preprocess-1.c: New test.
-
---- gcc/c-ppoutput.c.jj	2008-01-26 18:01:16.000000000 +0100
-+++ gcc/c-ppoutput.c	2008-02-26 22:54:57.000000000 +0100
-@@ -1,6 +1,6 @@
- /* Preprocess only, using cpplib.
--   Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007
--   Free Software Foundation, Inc.
-+   Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007,
-+   2008 Free Software Foundation, Inc.
-    Written by Per Bothner, 1994-95.
- 
-    This program is free software; you can redistribute it and/or modify it
-@@ -177,7 +177,24 @@ scan_translation_unit (cpp_reader *pfile
-       avoid_paste = false;
-       print.source = NULL;
-       print.prev = token;
--      cpp_output_token (token, print.outf);
-+      if (token->type == CPP_PRAGMA)
-+	{
-+	  const char *space;
-+	  const char *name;
-+
-+	  maybe_print_line (token->src_loc);
-+	  fputs ("#pragma ", print.outf);
-+	  c_pp_lookup_pragma (token->val.pragma, &space, &name);
-+	  if (space)
-+	    fprintf (print.outf, "%s %s", space, name);
-+	  else
-+	    fprintf (print.outf, "%s", name);
-+	  print.printed = 1;
-+	}
-+      else if (token->type == CPP_PRAGMA_EOL)
-+	maybe_print_line (token->src_loc);
-+      else
-+	cpp_output_token (token, print.outf);
- 
-       if (token->type == CPP_COMMENT)
- 	account_for_newlines (token->val.str.text, token->val.str.len);
---- gcc/c-pragma.c.jj	2008-02-15 18:43:03.000000000 +0100
-+++ gcc/c-pragma.c	2008-02-26 22:59:44.000000000 +0100
-@@ -1,6 +1,6 @@
- /* Handle #pragma, system V.4 style.  Supports #pragma weak and #pragma pack.
-    Copyright (C) 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
--   2006, 2007 Free Software Foundation, Inc.
-+   2006, 2007, 2008 Free Software Foundation, Inc.
- 
- This file is part of GCC.
- 
-@@ -872,6 +872,61 @@ DEF_VEC_ALLOC_O (pragma_handler, heap);
- 
- static VEC(pragma_handler, heap) *registered_pragmas;
- 
-+typedef struct
-+{
-+  const char *space;
-+  const char *name;
-+} pragma_ns_name;
-+
-+DEF_VEC_O (pragma_ns_name);
-+DEF_VEC_ALLOC_O (pragma_ns_name, heap);
-+
-+static VEC(pragma_ns_name, heap) *registered_pp_pragmas;
-+
-+struct omp_pragma_def { const char *name; unsigned int id; };
-+static const struct omp_pragma_def omp_pragmas[] = {
-+  { "atomic", PRAGMA_OMP_ATOMIC },
-+  { "barrier", PRAGMA_OMP_BARRIER },
-+  { "critical", PRAGMA_OMP_CRITICAL },
-+  { "flush", PRAGMA_OMP_FLUSH },
-+  { "for", PRAGMA_OMP_FOR },
-+  { "master", PRAGMA_OMP_MASTER },
-+  { "ordered", PRAGMA_OMP_ORDERED },
-+  { "parallel", PRAGMA_OMP_PARALLEL },
-+  { "section", PRAGMA_OMP_SECTION },
-+  { "sections", PRAGMA_OMP_SECTIONS },
-+  { "single", PRAGMA_OMP_SINGLE },
-+  { "threadprivate", PRAGMA_OMP_THREADPRIVATE }
-+};
-+
-+void
-+c_pp_lookup_pragma (unsigned int id, const char **space, const char **name)
-+{
-+  const int n_omp_pragmas = sizeof (omp_pragmas) / sizeof (*omp_pragmas);
-+  int i;
-+
-+  for (i = 0; i < n_omp_pragmas; ++i)
-+    if (omp_pragmas[i].id == id)
-+      {
-+	*space = "omp";
-+	*name = omp_pragmas[i].name;
-+	return;
-+      }
-+
-+  if (id >= PRAGMA_FIRST_EXTERNAL
-+      && (id < PRAGMA_FIRST_EXTERNAL
-+	  + VEC_length (pragma_ns_name, registered_pp_pragmas)))
-+    {
-+      *space = VEC_index (pragma_ns_name, registered_pp_pragmas,
-+			  id - PRAGMA_FIRST_EXTERNAL)->space;
-+      *name = VEC_index (pragma_ns_name, registered_pp_pragmas,
-+			 id - PRAGMA_FIRST_EXTERNAL)->name;
-+      return;
-+    }
-+
-+  gcc_unreachable ();
-+}
-+
- /* Front-end wrappers for pragma registration to avoid dragging
-    cpplib.h in almost everywhere.  */
- 
-@@ -881,13 +936,29 @@ c_register_pragma_1 (const char *space, 
- {
-   unsigned id;
- 
--  VEC_safe_push (pragma_handler, heap, registered_pragmas, &handler);
--  id = VEC_length (pragma_handler, registered_pragmas);
--  id += PRAGMA_FIRST_EXTERNAL - 1;
--
--  /* The C++ front end allocates 6 bits in cp_token; the C front end
--     allocates 7 bits in c_token.  At present this is sufficient.  */
--  gcc_assert (id < 64);
-+  if (flag_preprocess_only)
-+    {
-+      pragma_ns_name ns_name;
-+
-+      if (!allow_expansion)
-+	return;
-+
-+      ns_name.space = space;
-+      ns_name.name = name;
-+      VEC_safe_push (pragma_ns_name, heap, registered_pp_pragmas, &ns_name);
-+      id = VEC_length (pragma_ns_name, registered_pp_pragmas);
-+      id += PRAGMA_FIRST_EXTERNAL - 1;
-+    }
-+  else
-+    {
-+      VEC_safe_push (pragma_handler, heap, registered_pragmas, &handler);
-+      id = VEC_length (pragma_handler, registered_pragmas);
-+      id += PRAGMA_FIRST_EXTERNAL - 1;
-+
-+      /* The C++ front end allocates 6 bits in cp_token; the C front end
-+	 allocates 7 bits in c_token.  At present this is sufficient.  */
-+      gcc_assert (id < 64);
-+    }
- 
-   cpp_register_deferred_pragma (parse_in, space, name, id,
- 				allow_expansion, false);
-@@ -921,24 +992,8 @@ c_invoke_pragma_handler (unsigned int id
- void
- init_pragma (void)
- {
--  if (flag_openmp && !flag_preprocess_only)
-+  if (flag_openmp)
-     {
--      struct omp_pragma_def { const char *name; unsigned int id; };
--      static const struct omp_pragma_def omp_pragmas[] = {
--	{ "atomic", PRAGMA_OMP_ATOMIC },
--	{ "barrier", PRAGMA_OMP_BARRIER },
--	{ "critical", PRAGMA_OMP_CRITICAL },
--	{ "flush", PRAGMA_OMP_FLUSH },
--	{ "for", PRAGMA_OMP_FOR },
--	{ "master", PRAGMA_OMP_MASTER },
--	{ "ordered", PRAGMA_OMP_ORDERED },
--	{ "parallel", PRAGMA_OMP_PARALLEL },
--	{ "section", PRAGMA_OMP_SECTION },
--	{ "sections", PRAGMA_OMP_SECTIONS },
--	{ "single", PRAGMA_OMP_SINGLE },
--	{ "threadprivate", PRAGMA_OMP_THREADPRIVATE }
--      };
--
-       const int n_omp_pragmas = sizeof (omp_pragmas) / sizeof (*omp_pragmas);
-       int i;
- 
-@@ -947,8 +1002,9 @@ init_pragma (void)
- 				      omp_pragmas[i].id, true, true);
-     }
- 
--  cpp_register_deferred_pragma (parse_in, "GCC", "pch_preprocess",
--				PRAGMA_GCC_PCH_PREPROCESS, false, false);
-+  if (!flag_preprocess_only)
-+    cpp_register_deferred_pragma (parse_in, "GCC", "pch_preprocess",
-+				  PRAGMA_GCC_PCH_PREPROCESS, false, false);
- 
- #ifdef HANDLE_PRAGMA_PACK
- #ifdef HANDLE_PRAGMA_PACK_WITH_EXPANSION
---- gcc/c-opts.c.jj	2008-02-26 22:53:23.000000000 +0100
-+++ gcc/c-opts.c	2008-02-26 22:54:57.000000000 +0100
-@@ -1,5 +1,5 @@
- /* C/ObjC/C++ command line option handling.
--   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
-+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
-    Free Software Foundation, Inc.
-    Contributed by Neil Booth.
- 
-@@ -1239,6 +1239,9 @@ c_common_init (void)
-   if (version_flag)
-     c_common_print_pch_checksum (stderr);
- 
-+  /* Has to wait until now so that cpplib has its hash table.  */
-+  init_pragma ();
-+
-   if (flag_preprocess_only)
-     {
-       finish_options ();
-@@ -1246,9 +1249,6 @@ c_common_init (void)
-       return false;
-     }
- 
--  /* Has to wait until now so that cpplib has its hash table.  */
--  init_pragma ();
--
-   return true;
- }
- 
---- gcc/c-pragma.h.jj	2008-01-26 18:01:16.000000000 +0100
-+++ gcc/c-pragma.h	2008-02-26 22:54:57.000000000 +0100
-@@ -1,6 +1,6 @@
- /* Pragma related interfaces.
-    Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
--   2007  Free Software Foundation, Inc.
-+   2007, 2008  Free Software Foundation, Inc.
- 
- This file is part of GCC.
- 
-@@ -124,4 +124,6 @@ extern enum cpp_ttype pragma_lex (tree *
- extern enum cpp_ttype c_lex_with_flags (tree *, location_t *, unsigned char *,
- 					int);
- 
-+extern void c_pp_lookup_pragma (unsigned int, const char **, const char **);
-+
- #endif /* GCC_C_PRAGMA_H */
---- gcc/config/darwin.h.jj	2008-02-11 14:48:12.000000000 +0100
-+++ gcc/config/darwin.h	2008-02-26 22:54:57.000000000 +0100
-@@ -892,8 +892,9 @@ enum machopic_addr_class {
- 
- #define DARWIN_REGISTER_TARGET_PRAGMAS()			\
-   do {								\
--    cpp_register_pragma (parse_in, NULL, "mark",		\
--			 darwin_pragma_ignore, false);		\
-+    if (!flag_preprocess_only)					\
-+      cpp_register_pragma (parse_in, NULL, "mark",		\
-+			   darwin_pragma_ignore, false);	\
-     c_register_pragma (0, "options", darwin_pragma_options);	\
-     c_register_pragma (0, "segment", darwin_pragma_ignore);	\
-     c_register_pragma (0, "unused", darwin_pragma_unused);	\
---- gcc/testsuite/gcc.dg/gomp/preprocess-1.c.jj	2008-02-26 22:54:57.000000000 +0100
-+++ gcc/testsuite/gcc.dg/gomp/preprocess-1.c	2008-02-26 22:54:57.000000000 +0100
-@@ -0,0 +1,16 @@
-+/* { dg-do preprocess } */
-+
-+void foo (void)
-+{
-+  int i1, j1, k1;
-+#define p parallel
-+#define P(x) private (x##1)
-+#define S(x) shared (x##1)
-+#define F(x) firstprivate (x##1)
-+#pragma omp p P(i) \
-+  S(j) \
-+  F(k)
-+  ;
-+}
-+
-+/* { dg-final { scan-file preprocess-1.i "(^|\n)#pragma omp parallel private \\(i1\\) shared \\(j1\\) firstprivate \\(k1\\)($|\n)" } } */
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-i386-libgomp.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-i386-libgomp.patch
deleted file mode 100644
index 2ad3b24..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-i386-libgomp.patch
+++ /dev/null
@@ -1,61 +0,0 @@ 
-Build i386.rpm libgomp and libsupc++.a(guard.o) as i486+, pre-i486
-hardware isn't supported because NPTL doesn't support it anyway.
-
---- libgomp/configure.tgt.jj	2008-01-10 20:53:48.000000000 +0100
-+++ libgomp/configure.tgt	2008-03-27 12:44:51.000000000 +0100
-@@ -44,14 +44,14 @@ if test $enable_linux_futex = yes; then
- 	;;
- 
-     # Note that bare i386 is not included here.  We need cmpxchg.
--    i[456]86-*-linux*)
-+    i[3456]86-*-linux*)
- 	config_path="linux/x86 linux posix"
- 	case " ${CC} ${CFLAGS} " in
- 	  *" -m64 "*)
- 	    ;;
- 	  *)
- 	    if test -z "$with_arch"; then
--	      XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
-+	      XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
- 	    fi
- 	esac
- 	;;
-@@ -63,7 +63,7 @@ if test $enable_linux_futex = yes; then
- 	config_path="linux/x86 linux posix"
- 	case " ${CC} ${CFLAGS} " in
- 	  *" -m32 "*)
--	    XCFLAGS="${XCFLAGS} -march=i486 -mtune=i686"
-+	    XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
- 	    ;;
- 	esac
- 	;;
---- libstdc++-v3/libsupc++/guard.cc.jj	2008-03-01 00:58:24.000000000 +0100
-+++ libstdc++-v3/libsupc++/guard.cc	2008-03-27 14:08:44.000000000 +0100
-@@ -35,6 +35,27 @@
- #include <new>
- #include <ext/atomicity.h>
- #include <ext/concurrence.h>
-+#if defined __i386__ && !defined _GLIBCXX_ATOMIC_BUILTINS
-+# define _GLIBCXX_ATOMIC_BUILTINS 1
-+# define __sync_val_compare_and_swap(a, b, c) \
-+  ({								\
-+     typedef char sltast[sizeof (*a) == sizeof (int) ? 1 : -1];	\
-+     int sltas;							\
-+     __asm __volatile ("lock; cmpxchgl %3, (%1)"		\
-+		       : "=a" (sltas)				\
-+		       : "r" (a), "0" (b), "r" (c) : "memory");	\
-+     sltas;							\
-+   })
-+# define __sync_lock_test_and_set(a, b) \
-+  ({								\
-+     typedef char sltast[sizeof (*a) == sizeof (int) ? 1 : -1];	\
-+     int sltas;							\
-+     __asm __volatile ("xchgl (%1), %0"				\
-+		       : "=r" (sltas)				\
-+		       : "r" (a), "0" (b) : "memory");		\
-+     sltas;							\
-+   })
-+#endif
- #if defined(__GTHREADS) && defined(__GTHREAD_HAS_COND) \
-     && defined(_GLIBCXX_ATOMIC_BUILTINS) && defined(_GLIBCXX_HAVE_LINUX_FUTEX)
- # include <climits>
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-ia64-libunwind.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-ia64-libunwind.patch
deleted file mode 100644
index 8e10979..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-ia64-libunwind.patch
+++ /dev/null
@@ -1,538 +0,0 @@ 
-2004-11-27  Jakub Jelinek  <jakub@redhat.com>
-
-	* config.gcc (ia64*-*-linux*): If native and libelf is installed,
-	use ia64/t-glibc-no-libunwind instead of the other t-*unwind*
-	fragments.
-	* config/ia64/t-glibc-no-libunwind: New file.
-	* config/ia64/change-symver.c: New file.
-	* config/ia64/unwind-ia64.c: If USE_SYMVER_GLOBAL and SHARED,
-	define _Unwind_* to __symverglobal_Unwind_*.
-	(alias): Undefine.
-	(symverglobal): Define.  Use it on _Unwind_*.
-	* config/ia64/mkmap-symver-multi.awk: New file.
-	* config/ia64/libgcc-ia64-no-libunwind.ver: New file.
-
---- gcc/config.gcc.jj	2004-10-04 08:55:44.000000000 -0400
-+++ gcc/config.gcc	2004-11-13 05:23:50.000000000 -0500
-@@ -1185,9 +1185,16 @@ ia64*-*-freebsd*)
- 	;;
- ia64*-*-linux*)
- 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h ia64/sysv4.h ia64/linux.h"
--	tmake_file="${tmake_file} ia64/t-ia64 t-libunwind ia64/t-glibc"
--	if test x$with_system_libunwind != xyes ; then
--		tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
-+	tmake_file="${tmake_file} ia64/t-ia64"
-+	if test x${target} = x${host} && test x${target} = x${build} \
-+	   && grep gelf_getverdef /usr/include/gelf.h > /dev/null 2>&1 \
-+	   && test -f /usr/lib/libelf.so; then
-+		tmake_file="${tmake_file} ia64/t-glibc-no-libunwind"
-+	else
-+		tmake_file="${tmake_file} t-libunwind ia64/t-glibc"
-+		if test x$with_system_libunwind != xyes ; then
-+			tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
-+		fi
- 	fi
- 	target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
- 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
---- gcc/config/ia64/t-glibc-no-libunwind.jj	2004-02-18 10:27:36.000000000 -0500
-+++ gcc/config/ia64/t-glibc-no-libunwind	2004-11-15 09:56:33.000000000 -0500
-@@ -0,0 +1,30 @@
-+# Don't use system libunwind library on IA-64 GLIBC based system,
-+# but make _Unwind_* symbols unversioned, so that created programs
-+# are usable even when libgcc_s uses libunwind.
-+LIB2ADDEH += $(srcdir)/config/ia64/fde-glibc.c
-+SHLIB_MAPFILES += $(srcdir)/config/ia64/libgcc-ia64-no-libunwind.ver
-+SHLIB_MKMAP = $(srcdir)/config/ia64/mkmap-symver-multi.awk
-+
-+SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
-+	-Wl,--soname=$(SHLIB_SONAME) \
-+	-Wl,--version-script=$(SHLIB_MAP) \
-+	-o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \
-+	rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \
-+	if [ -f $(SHLIB_DIR)/$(SHLIB_SONAME) ]; then \
-+	  mv -f $(SHLIB_DIR)/$(SHLIB_SONAME) \
-+		$(SHLIB_DIR)/$(SHLIB_SONAME).backup; \
-+	else true; fi && \
-+	gcc -O2 -o $(SHLIB_DIR)/$(SHLIB_SONAME).tweak \
-+	  $$(gcc_srcdir)/config/ia64/change-symver.c -lelf && \
-+	$(SHLIB_DIR)/$(SHLIB_SONAME).tweak $(SHLIB_DIR)/$(SHLIB_SONAME).tmp \
-+	GCC_3.4.2 _GLOBAL_ \
-+	_Unwind_GetGR _Unwind_RaiseException _Unwind_GetRegionStart _Unwind_SetIP \
-+	_Unwind_GetIP _Unwind_GetLanguageSpecificData _Unwind_Resume \
-+	_Unwind_DeleteException _Unwind_SetGR _Unwind_ForcedUnwind \
-+	_Unwind_Backtrace _Unwind_FindEnclosingFunction _Unwind_GetCFA \
-+	_Unwind_Resume_or_Rethrow _Unwind_GetBSP && \
-+	rm -f $(SHLIB_DIR)/$(SHLIB_SONAME).tweak && \
-+	mv $(SHLIB_DIR)/$(SHLIB_SONAME).tmp $(SHLIB_DIR)/$(SHLIB_SONAME) && \
-+	$(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
-+
-+TARGET_LIBGCC2_CFLAGS += -DUSE_SYMVER_GLOBAL
---- gcc/config/ia64/change-symver.c.jj	2004-02-18 10:27:36.000000000 -0500
-+++ gcc/config/ia64/change-symver.c	2004-11-13 05:23:50.000000000 -0500
-@@ -0,0 +1,211 @@
-+#define _GNU_SOURCE 1
-+#define _FILE_OFFSET_BITS 64
-+#include <endian.h>
-+#include <errno.h>
-+#include <error.h>
-+#include <fcntl.h>
-+#include <fnmatch.h>
-+#include <gelf.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+int
-+compute_veridx (const char *name, Elf *elf, Elf_Data *verd, GElf_Shdr *verd_shdr)
-+{
-+  if (strcmp (name, "_GLOBAL_") == 0)
-+    return 1;
-+
-+  int cnt;
-+  size_t offset = 0;
-+  for (cnt = verd_shdr->sh_info; --cnt >= 0; )
-+    {
-+      GElf_Verdef defmem;
-+      GElf_Verdef *def;
-+      GElf_Verdaux auxmem;
-+      GElf_Verdaux *aux;
-+      unsigned int auxoffset;
-+
-+      /* Get the data at the next offset.  */
-+      def = gelf_getverdef (verd, offset, &defmem);
-+      if (def == NULL)
-+	break;
-+
-+      auxoffset = offset + def->vd_aux;
-+      aux = gelf_getverdaux (verd, auxoffset, &auxmem);
-+      if (aux == NULL)
-+	break;
-+
-+      if (strcmp (name, elf_strptr (elf, verd_shdr->sh_link,
-+		  aux->vda_name)) == 0)
-+	return def->vd_ndx;
-+
-+      /* Find the next offset.  */
-+      offset += def->vd_next;
-+    }
-+
-+  return -1;
-+}
-+
-+int
-+main (int argc, char **argv)
-+{
-+  if (argc < 4)
-+    error (1, 0, "Usage: change_symver library from_symver to_symver symbol...\nExample: change_symver libfoo.so FOO_1.0 *global* bar baz");
-+
-+  const char *fname = argv[1];
-+
-+  /* Open the file.  */
-+  int fd;
-+  fd = open (fname, O_RDWR);
-+  if (fd == -1)
-+    error (1, errno, fname);
-+
-+  elf_version (EV_CURRENT);
-+
-+  /* Now get the ELF descriptor.  */
-+  Elf *elf = elf_begin (fd, ELF_C_READ_MMAP, NULL);
-+  if (elf == NULL || elf_kind (elf) != ELF_K_ELF)
-+    error (1, 0, "Couldn't open %s: %s", fname, elf_errmsg (-1));
-+
-+  size_t shstrndx;
-+  /* Get the section header string table index.  */
-+  if (elf_getshstrndx (elf, &shstrndx) < 0)
-+    error (1, 0, "cannot get shstrndx from %s", fname);
-+
-+  GElf_Ehdr ehdr_mem;
-+  GElf_Ehdr *ehdr;
-+
-+  /* We need the ELF header in a few places.  */
-+  ehdr = gelf_getehdr (elf, &ehdr_mem);
-+  if (ehdr == NULL)
-+    error (1, 0, "couldn't get ELF headers %s: %s", fname, elf_errmsg (-1));
-+
-+  Elf_Scn *scn = NULL;
-+  GElf_Shdr shdr_mem, verd_shdr, ver_shdr, dynsym_shdr;
-+  Elf_Data *ver = NULL, *verd = NULL, *dynsym = NULL;
-+
-+  while ((scn = elf_nextscn (elf, scn)) != NULL)
-+    {
-+      GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
-+
-+      if (shdr == NULL)
-+	error (1, 0, "couldn't get shdr from %s", fname);
-+
-+      if ((shdr->sh_flags & SHF_ALLOC) != 0)
-+	{
-+	  const char *name = elf_strptr (elf, shstrndx, shdr->sh_name);
-+	  Elf_Data **p;
-+
-+	  if (strcmp (name, ".gnu.version") == 0)
-+	    {
-+	      p = &ver;
-+	      ver_shdr = *shdr;
-+	    }
-+	  else if (strcmp (name, ".gnu.version_d") == 0)
-+	    {
-+	      p = &verd;
-+	      verd_shdr = *shdr;
-+	    }
-+	  else if (strcmp (name, ".dynsym") == 0)
-+	    {
-+	      p = &dynsym;
-+	      dynsym_shdr = *shdr;
-+	    }
-+	  else
-+	    continue;
-+
-+	  if (*p != NULL)
-+	    error (1, 0, "Two %s sections in %s", name, fname);
-+	  *p = elf_getdata (scn, NULL);
-+	  if (*p == NULL || elf_getdata (scn, *p) != NULL)
-+	    error (1, 0, "No data or non-contiguous data in %s section in %s",
-+		   name, fname);
-+	}
-+    }
-+
-+  if (ver == NULL || verd == NULL || dynsym == NULL)
-+    error (1, 0, "Couldn't find one of the needed sections in %s", fname);
-+
-+  int from_idx = compute_veridx (argv[2], elf, verd, &verd_shdr);
-+  if (from_idx == -1)
-+    error (1, 0, "Could not find symbol version %s in %s", argv[2], fname);
-+
-+  int to_idx = compute_veridx (argv[3], elf, verd, &verd_shdr);
-+  if (to_idx == -1)
-+    error (1, 0, "Could not find symbol version %s in %s", argv[3], fname);
-+
-+  if (dynsym_shdr.sh_entsize != gelf_fsize (elf, ELF_T_SYM, 1, ehdr->e_version)
-+      || dynsym_shdr.sh_size % dynsym_shdr.sh_entsize
-+      || ver_shdr.sh_entsize != 2
-+      || (ver_shdr.sh_size & 1)
-+      || dynsym_shdr.sh_size / dynsym_shdr.sh_entsize != ver_shdr.sh_size / 2)
-+    error (1, 0, "Unexpected sh_size or sh_entsize in %s", fname);
-+
-+  size_t nentries = ver_shdr.sh_size / 2;
-+  size_t cnt;
-+  GElf_Versym array[nentries];
-+  for (cnt = 0; cnt < nentries; ++cnt)
-+    {
-+      GElf_Versym vsymmem;
-+      GElf_Versym *vsym;
-+
-+      vsym = gelf_getversym (ver, cnt, &vsymmem);
-+      if (vsym == NULL)
-+	error (1, 0, "gelt_getversym failed in %s: %s", fname, elf_errmsg (-1));
-+
-+      array[cnt] = *vsym;
-+      if (*vsym != from_idx)
-+	continue;
-+
-+      GElf_Sym sym_mem;
-+      GElf_Sym *sym;
-+      sym = gelf_getsym (dynsym, cnt, &sym_mem);
-+      if (sym == NULL)
-+	error (1, 0, "gelt_getsym failed in %s: %s", fname, elf_errmsg (-1));
-+
-+      const char *name = elf_strptr (elf, dynsym_shdr.sh_link, sym->st_name);
-+
-+      int argn;
-+      for (argn = 4; argn < argc; ++argn)
-+	if (fnmatch (argv[argn], name, 0) == 0)
-+	  {
-+	    array[cnt] = to_idx;
-+	    break;
-+	  }
-+    }
-+
-+  if (sizeof (array[0]) != 2)
-+    abort ();
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+  if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB)
-+    ;
-+  else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB)
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+  if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB)
-+    ;
-+  else if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB)
-+#else
-+# error Unsupported endianity
-+#endif
-+    {
-+      for (cnt = 0; cnt < nentries; ++cnt)
-+	array[cnt] = ((array[cnt] & 0xff) << 8) | ((array[cnt] & 0xff00) >> 8);
-+    }
-+  else
-+    error (1, 0, "Unknown EI_DATA %d in %s", ehdr->e_ident[EI_DATA], fname);
-+
-+  if (elf_end (elf) != 0)
-+    error (1, 0, "couldn't close %s: %s", fname, elf_errmsg (-1));
-+
-+  if (lseek (fd, ver_shdr.sh_offset, SEEK_SET) != (off_t) ver_shdr.sh_offset)
-+    error (1, 0, "failed to seek to %zd in %s", (size_t) ver_shdr.sh_offset,
-+	   fname);
-+
-+  if (write (fd, array, 2 * nentries) != (ssize_t) (2 * nentries))
-+    error (1, 0, "failed to write .gnu.version section into %s", fname);
-+
-+  close (fd);
-+  return 0;
-+}
---- gcc/config/ia64/unwind-ia64.c.jj	2004-10-04 08:55:57.000000000 -0400
-+++ gcc/config/ia64/unwind-ia64.c	2004-11-15 09:07:45.000000000 -0500
-@@ -51,6 +51,51 @@
- #define UNW_FLAG_UHANDLER(x)	((x) & 0x0000000200000000L)
- #define UNW_LENGTH(x)		((x) & 0x00000000ffffffffL)
- 
-+#if defined (USE_SYMVER_GLOBAL) && defined (SHARED)
-+extern _Unwind_Reason_Code __symverglobal_Unwind_Backtrace
-+  (_Unwind_Trace_Fn, void *);
-+extern void __symverglobal_Unwind_DeleteException
-+  (struct _Unwind_Exception *);
-+extern void * __symverglobal_Unwind_FindEnclosingFunction (void *);
-+extern _Unwind_Reason_Code __symverglobal_Unwind_ForcedUnwind
-+  (struct _Unwind_Exception *, _Unwind_Stop_Fn, void *);
-+extern _Unwind_Word __symverglobal_Unwind_GetCFA
-+  (struct _Unwind_Context *);
-+extern _Unwind_Word __symverglobal_Unwind_GetBSP
-+  (struct _Unwind_Context *);
-+extern _Unwind_Word __symverglobal_Unwind_GetGR
-+  (struct _Unwind_Context *, int );
-+extern _Unwind_Ptr __symverglobal_Unwind_GetIP (struct _Unwind_Context *);
-+extern void *__symverglobal_Unwind_GetLanguageSpecificData
-+  (struct _Unwind_Context *);
-+extern _Unwind_Ptr __symverglobal_Unwind_GetRegionStart
-+  (struct _Unwind_Context *);
-+extern _Unwind_Reason_Code __symverglobal_Unwind_RaiseException
-+  (struct _Unwind_Exception *);
-+extern void __symverglobal_Unwind_Resume (struct _Unwind_Exception *);
-+extern _Unwind_Reason_Code __symverglobal_Unwind_Resume_or_Rethrow
-+   (struct _Unwind_Exception *);
-+extern void __symverglobal_Unwind_SetGR
-+  (struct _Unwind_Context *, int, _Unwind_Word);
-+extern void __symverglobal_Unwind_SetIP
-+  (struct _Unwind_Context *, _Unwind_Ptr);
-+#define _Unwind_Backtrace __symverglobal_Unwind_Backtrace
-+#define _Unwind_DeleteException __symverglobal_Unwind_DeleteException
-+#define _Unwind_FindEnclosingFunction __symverglobal_Unwind_FindEnclosingFunction
-+#define _Unwind_ForcedUnwind __symverglobal_Unwind_ForcedUnwind
-+#define _Unwind_GetBSP __symverglobal_Unwind_GetBSP
-+#define _Unwind_GetCFA __symverglobal_Unwind_GetCFA
-+#define _Unwind_GetGR __symverglobal_Unwind_GetGR
-+#define _Unwind_GetIP __symverglobal_Unwind_GetIP
-+#define _Unwind_GetLanguageSpecificData __symverglobal_Unwind_GetLanguageSpecificData
-+#define _Unwind_GetRegionStart __symverglobal_Unwind_GetRegionStart
-+#define _Unwind_RaiseException __symverglobal_Unwind_RaiseException
-+#define _Unwind_Resume __symverglobal_Unwind_Resume
-+#define _Unwind_Resume_or_Rethrow __symverglobal_Unwind_Resume_or_Rethrow
-+#define _Unwind_SetGR __symverglobal_Unwind_SetGR
-+#define _Unwind_SetIP __symverglobal_Unwind_SetIP
-+#endif
-+
- enum unw_application_register
- {
-   UNW_AR_BSP,
-@@ -2402,4 +2447,44 @@ alias (_Unwind_SetGR);
- alias (_Unwind_SetIP);
- #endif
- 
-+#if defined (USE_SYMVER_GLOBAL) && defined (SHARED)
-+#undef alias
-+#define symverglobal(name, version) \
-+__typeof (__symverglobal##name) __symverlocal##name		\
-+  __attribute__ ((alias ("__symverglobal" #name)));		\
-+__asm__ (".symver __symverglobal" #name"," #name "@@GCC_3.4.2");\
-+__asm__ (".symver __symverlocal" #name"," #name "@" #version)
-+
-+#undef _Unwind_Backtrace
-+#undef _Unwind_DeleteException
-+#undef _Unwind_FindEnclosingFunction
-+#undef _Unwind_ForcedUnwind
-+#undef _Unwind_GetBSP
-+#undef _Unwind_GetCFA
-+#undef _Unwind_GetGR
-+#undef _Unwind_GetIP
-+#undef _Unwind_GetLanguageSpecificData
-+#undef _Unwind_GetRegionStart
-+#undef _Unwind_RaiseException
-+#undef _Unwind_Resume
-+#undef _Unwind_Resume_or_Rethrow
-+#undef _Unwind_SetGR
-+#undef _Unwind_SetIP
-+symverglobal (_Unwind_Backtrace, GCC_3.3);
-+symverglobal (_Unwind_DeleteException, GCC_3.0);
-+symverglobal (_Unwind_FindEnclosingFunction, GCC_3.3);
-+symverglobal (_Unwind_ForcedUnwind, GCC_3.0);
-+symverglobal (_Unwind_GetBSP, GCC_3.3.2);
-+symverglobal (_Unwind_GetCFA, GCC_3.3);
-+symverglobal (_Unwind_GetGR, GCC_3.0);
-+symverglobal (_Unwind_GetIP, GCC_3.0);
-+symverglobal (_Unwind_GetLanguageSpecificData, GCC_3.0);
-+symverglobal (_Unwind_GetRegionStart, GCC_3.0);
-+symverglobal (_Unwind_RaiseException, GCC_3.0);
-+symverglobal (_Unwind_Resume, GCC_3.0);
-+symverglobal (_Unwind_Resume_or_Rethrow, GCC_3.3);
-+symverglobal (_Unwind_SetGR, GCC_3.0);
-+symverglobal (_Unwind_SetIP, GCC_3.0);
-+#endif
-+
- #endif
---- gcc/config/ia64/mkmap-symver-multi.awk.jj	2004-02-18 10:27:36.000000000 -0500
-+++ gcc/config/ia64/mkmap-symver-multi.awk	2004-11-15 09:46:50.000000000 -0500
-@@ -0,0 +1,133 @@
-+# Generate an ELF symbol version map a-la Solaris and GNU ld.
-+#	Contributed by Richard Henderson <rth@cygnus.com>
-+#
-+# This file is part of GCC.
-+#
-+# GCC is free software; you can redistribute it and/or modify it under
-+# the terms of the GNU General Public License as published by the Free
-+# Software Foundation; either version 2, or (at your option) any later
-+# version.
-+#
-+# GCC is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-+# License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GCC; see the file COPYING.  If not, write to the Free
-+# Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+
-+BEGIN {
-+  state = "nm";
-+  sawsymbol = 0;
-+}
-+
-+# Remove comment and blank lines.
-+/^ *#/ || /^ *$/ {
-+  next;
-+}
-+
-+# We begin with nm input.  Collect the set of symbols that are present
-+# so that we can not emit them into the final version script -- Solaris
-+# complains at us if we do.
-+
-+state == "nm" && /^%%/ {
-+  state = "ver";
-+  next;
-+}
-+
-+state == "nm" && ($1 == "U" || $2 == "U") {
-+  next;
-+}
-+
-+state == "nm" && NF == 3 {
-+  if ($3 ~ /^[^@]*@GCC_[0-9.]*$/) {
-+    def[$3] = 1
-+    tl=$3
-+    sub(/^.*@/,"",tl)
-+    ver[$3] = tl
-+  } else {
-+    sub(/@@?GCC_[0-9.]*$/,"",$3)
-+    def[$3] = 1;
-+  }
-+  sawsymbol = 1;
-+  next;
-+}
-+
-+state == "nm" {
-+  next;
-+}
-+
-+# Now we process a simplified variant of the Solaris symbol version
-+# script.  We have one symbol per line, no semicolons, simple markers
-+# for beginning and ending each section, and %inherit markers for
-+# describing version inheritence.  A symbol may appear in more than
-+# one symbol version, and the last seen takes effect.
-+
-+NF == 3 && $1 == "%inherit" {
-+  inherit[$2] = $3;
-+  next;
-+}
-+
-+NF == 2 && $2 == "{" {
-+  libs[$1] = 1;
-+  thislib = $1;
-+  next;
-+}
-+
-+$1 == "}" {
-+  thislib = "";
-+  next;
-+}
-+
-+{
-+  ver[$1] = thislib;
-+  next;
-+}
-+
-+END {
-+  if (!sawsymbol)
-+    {
-+      print "No symbols seen -- broken or mis-installed nm?" | "cat 1>&2";
-+      exit 1;
-+    }
-+  for (l in libs)
-+    output(l);
-+}
-+
-+function output(lib) {
-+  if (done[lib])
-+    return;
-+  done[lib] = 1;
-+  if (inherit[lib])
-+    output(inherit[lib]);
-+
-+  empty=1
-+  for (sym in ver)
-+    if ((ver[sym] == lib) && (sym in def))
-+      {
-+	if (empty)
-+	  {
-+	    printf("%s {\n", lib);
-+	    printf("  global:\n");
-+	    empty = 0;
-+	  }
-+	symp = sym;
-+	sub(/@GCC_[0-9.]*$/,"",symp);
-+	printf("\t%s;\n", symp);
-+	if (dotsyms)
-+	  printf("\t.%s;\n", symp);
-+      }
-+
-+  if (empty)
-+    {
-+      for (l in libs)
-+	if (inherit[l] == lib)
-+	  inherit[l] = inherit[lib];
-+    }
-+  else if (inherit[lib])
-+    printf("} %s;\n", inherit[lib]);
-+  else
-+    printf ("\n  local:\n\t*;\n};\n");
-+}
---- gcc/config/ia64/libgcc-ia64-no-libunwind.ver.jj	2004-02-18 10:27:36.000000000 -0500
-+++ gcc/config/ia64/libgcc-ia64-no-libunwind.ver	2004-11-15 09:19:56.000000000 -0500
-@@ -0,0 +1,17 @@
-+GCC_3.4.2 {
-+  _Unwind_GetGR
-+  _Unwind_RaiseException
-+  _Unwind_GetRegionStart
-+  _Unwind_SetIP
-+  _Unwind_GetIP
-+  _Unwind_GetLanguageSpecificData
-+  _Unwind_Resume
-+  _Unwind_DeleteException
-+  _Unwind_SetGR
-+  _Unwind_ForcedUnwind
-+  _Unwind_Backtrace
-+  _Unwind_FindEnclosingFunction
-+  _Unwind_GetCFA
-+  _Unwind_Resume_or_Rethrow
-+  _Unwind_GetBSP
-+}
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-java-debug-iface-type.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-java-debug-iface-type.patch
deleted file mode 100644
index 63a1b50..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-java-debug-iface-type.patch
+++ /dev/null
@@ -1,17 +0,0 @@ 
-2008-01-25  Jakub Jelinek  <jakub@redhat.com>
-
-	* lang.c (java_classify_record): Revert 2007-12-20 change.
-
---- gcc/java/lang.c	2007-12-27 09:09:49.000000000 +0100
-+++ gcc/java/lang.c	2008-01-25 17:43:57.000000000 +0100
-@@ -965,9 +965,7 @@ java_classify_record (tree type)
-   if (! CLASS_P (type))
-     return RECORD_IS_STRUCT;
- 
--  /* ??? GDB does not support DW_TAG_interface_type as of December,
--     2007.  Re-enable this at a later time.  */
--  if (0 && CLASS_INTERFACE (TYPE_NAME (type)))
-+  if (CLASS_INTERFACE (TYPE_NAME (type)))
-     return RECORD_IS_INTERFACE;
- 
-   return RECORD_IS_CLASS;
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-java-nomulti.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-java-nomulti.patch
deleted file mode 100644
index f07ead8..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-java-nomulti.patch
+++ /dev/null
@@ -1,44 +0,0 @@ 
---- libjava/configure.ac.jj	2007-12-07 17:55:50.000000000 +0100
-+++ libjava/configure.ac	2007-12-07 18:36:56.000000000 +0100
-@@ -82,6 +82,13 @@ AC_ARG_ENABLE(java-maintainer-mode,
- 	[allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
- 
-+AC_ARG_ENABLE(libjava-multilib,
-+	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+  multilib=no
-+  ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
- 
---- libjava/configure.jj	2007-12-07 17:55:50.000000000 +0100
-+++ libjava/configure	2007-12-07 18:39:58.000000000 +0100
-@@ -1018,6 +1018,8 @@ Optional Features:
-   --enable-gconf-peer     compile GConf native peers for util.preferences
-   --enable-java-maintainer-mode
-                           allow rebuilding of .class and .h files
-+  --enable-libjava-multilib
-+                          build libjava as multilib
-   --disable-dependency-tracking  speeds up one-time build
-   --enable-dependency-tracking   do not reject slow dependency extractors
-   --enable-maintainer-mode  enable make rules and dependencies not useful
-@@ -1848,6 +1850,16 @@ else
- fi
- 
- 
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+  enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+  multilib=no
-+  ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- 
- 
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-libgomp-speedup.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-libgomp-speedup.patch
deleted file mode 100644
index da85e55..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-libgomp-speedup.patch
+++ /dev/null
@@ -1,2797 +0,0 @@ 
-2008-03-28  Jakub Jelinek  <jakub@redhat.com>
-
-	* config/linux/sparc/futex.h (atomic_write_barrier): Fix membar
-	argument.
-
-2008-03-27  Jakub Jelinek  <jakub@redhat.com>
-
-	* libgomp.h (struct gomp_team_state): Remove single_count field
-	ifndef HAVE_SYNC_BUILTINS.
-	(struct gomp_team): Likewise.  Add work_share_list_free_lock
-	ifndef HAVE_SYNC_BUILTINS.
-	* team.c (gomp_new_team): If HAVE_SYNC_BUILTINS is not defined,
-	don't initialize single_count, but instead initialize
-	work_share_list_free_lock.
-	(free_team): Destroy work_share_list_free_lock ifndef
-	HAVE_SYNC_BUILTINS.
-	(gomp_team_start): Don't initialize ts.single_count ifndef
-	HAVE_SYNC_BUILTINS.
-	* work.c (alloc_work_share, free_work_share): Use
-	work_share_list_free_lock instead of atomic chaining ifndef
-	HAVE_SYNC_BUILTINS.
-
-2008-03-26  Jakub Jelinek  <jakub@redhat.com>
-
-	* loop.c (gomp_loop_init): Fix GFS_DYNAMIC ws->mode setting.
-	* testsuite/libgomp.c/loop-4.c: New test.
-
-	* libgomp.h (struct gomp_team_state): Add single_count field.
-	(struct gomp_team): Likewise.
-	* team.c (gomp_new_team): Clear single_count.
-	(gomp_team_start): Likewise.
-	* single.c (GOMP_single_start): Rewritten if HAVE_SYNC_BUILTINS.
-
-2008-03-25  Jakub Jelinek  <jakub@redhat.com>
-
-	* team.c (gomp_thread_start): Don't clear ts.static_trip here.
-	* loop.c (gomp_loop_static_start, gomp_loop_dynamic_start): Clear
-	ts.static_trip here.
-	* work.c (gomp_work_share_start): Don't clear ts.static_trip here.
-
-2008-03-21  Jakub Jelinek  <jakub@redhat.com>
-
-	* libgomp.h: Include ptrlock.h.
-	(struct gomp_work_share): Reshuffle fields.  Add next_alloc,
-	next_ws, next_free and inline_ordered_team_ids fields, change
-	ordered_team_ids into pointer from flexible array member.
-	(struct gomp_team_state): Add last_work_share field, remove
-	work_share_generation.
-	(struct gomp_team): Remove work_share_lock, generation_mask,
-	oldest_live_gen, num_live_gen and init_work_shares fields, add
-	work work_share_list_alloc, work_share_list_free and work_share_chunk
-	fields.  Change work_shares from pointer to pointers into an array.
-	(gomp_new_team): New prototype.
-	(gomp_team_start): Change type of last argument.
-	(gomp_new_work_share): Removed.
-	(gomp_init_work_share, gomp_fini_work_share): New prototypes.
-	(gomp_work_share_init_done): New static inline.
-	* team.c (gomp_thread_start): Clear ts.last_work_share, don't clear
-	ts.work_share_generation.
-	(new_team): Removed.
-	(gomp_new_team): New function.
-	(free_team): Free gomp_work_share blocks chained through next_alloc,
-	instead of freeing work_shares and destroying work_share_lock.
-	(gomp_team_start): Change last argument from ws to team, don't create
-	new team, set ts.work_share to &team->work_shares[0] and clear
-	ts.last_work_share.  Don't clear ts.work_share_generation.
-	(gomp_team_end): Call gomp_fini_work_share.
-	* work.c (gomp_new_work_share): Removed.
-	(alloc_work_share, gomp_init_work_share, gomp_fini_work_share): New
-	functions.
-	(free_work_share): Add team argument.  Call gomp_fini_work_share
-	and then either free ws if orphaned, or put it into
-	work_share_list_free list of the current team.
-	(gomp_work_share_start, gomp_work_share_end,
-	gomp_work_share_end_nowait): Rewritten.
-	* sections.c (GOMP_sections_start): Call gomp_work_share_init_done
-	after gomp_sections_init.  If HAVE_SYNC_BUILTINS, call
-	gomp_iter_dynamic_next instead of the _locked variant and don't take
-	lock around it, otherwise acquire it before calling
-	gomp_iter_dynamic_next_locked.
-	(GOMP_sections_next): If HAVE_SYNC_BUILTINS, call
-	gomp_iter_dynamic_next instead of the _locked variant and don't take
-	lock around it.
-	(GOMP_parallel_sections_start): Call gomp_new_team instead of
-	gomp_new_work_share.  Call gomp_sections_init on &team->work_shares[0].
-	Adjust gomp_team_start caller.
-	* loop.c (gomp_loop_static_start, gomp_loop_ordered_static_start): Call
-	gomp_work_share_init_done after gomp_loop_init.  Don't unlock ws->lock.
-	(gomp_loop_dynamic_start, gomp_loop_guided_start): Call
-	gomp_work_share_init_done after gomp_loop_init.  If HAVE_SYNC_BUILTINS,
-	don't unlock ws->lock, otherwise lock it.
-	(gomp_loop_ordered_dynamic_start, gomp_loop_ordered_guided_start): Call
-	gomp_work_share_init_done after gomp_loop_init.  Lock ws->lock.
-	(gomp_parallel_loop_start): Call gomp_new_team instead of
-	gomp_new_work_share.  Call gomp_loop_init on &team->work_shares[0].
-	Adjust gomp_team_start caller.
-	* single.c (GOMP_single_start, GOMP_single_copy_start): Call
-	gomp_work_share_init_done if gomp_work_share_start returned true.
-	Don't unlock ws->lock.
-	* parallel.c (GOMP_parallel_start): Call gomp_new_team and pass that
-	as last argument to gomp_team_start.
-	* config/linux/ptrlock.c: New file.
-	* config/linux/ptrlock.h: New file.
-	* config/posix/ptrlock.c: New file.
-	* config/posix/ptrlock.h: New file.
-	* Makefile.am (libgomp_la_SOURCES): Add ptrlock.c.
-	* Makefile.in: Regenerated.
-	* testsuite/Makefile.in: Regenerated.
-
-2008-03-19  Jakub Jelinek  <jakub@redhat.com>
-
-	* libgomp.h (gomp_active_wait_policy): Remove decl.
-	(gomp_throttled_spin_count_var, gomp_available_cpus,
-	gomp_managed_threads): New extern decls.
-	* team.c (gomp_team_start, gomp_team_end): If number of threads
-	changed, adjust atomically gomp_managed_threads.
-	* env.c (gomp_active_wait_policy, gomp_block_time_var): Remove.
-	(gomp_throttled_spin_count_var, gomp_available_cpus,
-	gomp_managed_threads): New variables.
-	(parse_millis): Removed.
-	(parse_spincount): New function.
-	(parse_wait_policy): Return -1/0/1 instead of setting
-	gomp_active_wait_policy.
-	(initialize_env): Call gomp_init_num_threads unconditionally.
-	Initialize gomp_available_cpus.  Call parse_spincount instead
-	of parse_millis, initialize gomp_{,throttled_}spin_count_var
-	depending on presence and value of OMP_WAIT_POLICY and
-	GOMP_SPINCOUNT env vars.
-	* config/linux/wait.h (do_wait): Use gomp_throttled_spin_count_var
-	instead of gomp_spin_count_var if gomp_managed_threads >
-	gomp_available_cpus.
-
-	* config/linux/wait.h: Include errno.h.
-	(FUTEX_WAIT, FUTEX_WAKE, FUTEX_PRIVATE_FLAG): Define.
-	(gomp_futex_wake, gomp_futex_wait): New extern decls.
-	* config/linux/mutex.c (gomp_futex_wake, gomp_futex_wait): New
-	variables.
-	* config/linux/powerpc/futex.h (FUTEX_WAIT, FUTEX_WAKE): Remove.
-	(sys_futex0): Return error code.
-	(futex_wake, futex_wait): If ENOSYS was returned, clear
-	FUTEX_PRIVATE_FLAG in gomp_futex_wa{ke,it} and retry.
-	* config/linux/alpha/futex.h (FUTEX_WAIT, FUTEX_WAKE): Remove.
-	(futex_wake, futex_wait): If ENOSYS was returned, clear
-	FUTEX_PRIVATE_FLAG in gomp_futex_wa{ke,it} and retry.
-	* config/linux/x86/futex.h (FUTEX_WAIT, FUTEX_WAKE): Remove.
-	(sys_futex0): Return error code.
-	(futex_wake, futex_wait): If ENOSYS was returned, clear
-	FUTEX_PRIVATE_FLAG in gomp_futex_wa{ke,it} and retry.
-	* config/linux/s390/futex.h (FUTEX_WAIT, FUTEX_WAKE): Remove.
-	(sys_futex0): Return error code.
-	(futex_wake, futex_wait): If ENOSYS was returned, clear
-	FUTEX_PRIVATE_FLAG in gomp_futex_wa{ke,it} and retry.
-	* config/linux/ia64/futex.h (FUTEX_WAIT, FUTEX_WAKE): Remove.
-	(sys_futex0): Return error code.
-	(futex_wake, futex_wait): If ENOSYS was returned, clear
-	FUTEX_PRIVATE_FLAG in gomp_futex_wa{ke,it} and retry.
-	* config/linux/sparc/futex.h (FUTEX_WAIT, FUTEX_WAKE): Remove.
-	(sys_futex0): Return error code.
-	(futex_wake, futex_wait): If ENOSYS was returned, clear
-	FUTEX_PRIVATE_FLAG in gomp_futex_wa{ke,it} and retry.
-
-2008-03-18  Jakub Jelinek  <jakub@redhat.com>
-
-	* libgomp.h (struct gomp_work_share): Add mode field.  Put lock and
-	next into a different cache line from most of the write-once fields.
-	* loop.c: Include limits.h.
-	(gomp_loop_init): For GFS_DYNAMIC, multiply ws->chunk_size by incr.
-	If adding ws->chunk_size nthreads + 1 times after end won't
-	overflow, set ws->mode to 1.
-	* iter.c (gomp_iter_dynamic_next_locked): Don't multiply
-	ws->chunk_size by incr.
-	(gomp_iter_dynamic_next): Likewise.  If ws->mode, use more efficient
-	code.
-	* work.c: Include stddef.h.
-	(gomp_new_work_share): Use offsetof rather than sizeof.
-
-2008-03-17  Jakub Jelinek  <jakub@redhat.com>
-
-	* libgomp.h (struct gomp_team): Change ordered_release field
-	into gomp_sem_t ** from flexible array member.  Add implicit_task
-	and initial_work_shares fields.
-	(gomp_new_task): Removed.
-	(gomp_init_task): New prototype.
-	* team.c (new_team): Allocate implicit_task for each thread
-	and initial work_shares together with gomp_team allocation.
-	(free_team): Only free work_shares if it is not init_work_shares.
-	(gomp_team_start): Use gomp_init_task instead of gomp_new_task,
-	set thr->task to the corresponding implicit_task array entry.
-	* task.c (gomp_new_task): Removed.
-	(gomp_init_task): New function.
-	(gomp_end_task): Don't free the task.
-	(GOMP_task): Allocate struct gomp_task on the stack, call
-	gomp_init_task rather than gomp_new_task.
-	* work.c (gomp_work_share_start): If work_shares ==
-	init_work_shares, gomp_malloc + memcpy rather than gomp_realloc.
-
-2008-03-15  Jakub Jelinek  <jakub@redhat.com>
-	    Ulrich Drepper  <drepper@redhat.com>
-
-	* config/linux/bar.h (gomp_barrier_state_t): Rewritten.
-	(gomp_barrier_state_t): Change to unsigned int.
-	(gomp_barrier_init, gomp_barrier_reinit, gomp_barrier_destroy,
-	gomp_barrier_wait_start, gomp_barrier_last_thread): Rewritten.
-	(gomp_barrier_wait_last): Prototype rather than inline.
-	* config/linux/bar.c (gomp_barrier_wait_end): Rewritten.
-	(gomp_barrier_wait_last): New function.
-
-2008-03-15  Jakub Jelinek  <jakub@redhat.com>
-
-	* team.c (gomp_thread_start): Use gomp_barrier_wait_last instead
-	of gomp_barrier_wait.
-	* env.c (gomp_block_time_var, gomp_spin_count_var): New variables.
-	(parse_millis): New function.
-	(initialize_env): Handle GOMP_BLOCKTIME env var.
-	* libgomp.h (struct gomp_team): Move close to the end of the struct.
-	(gomp_spin_count_var): New extern var decl.
-	* work.c (gomp_work_share_end): Use gomp_barrier_state_t bstate
-	var instead of bool last, call gomp_barrier_last_thread to check
-	for last thread, pass bstate to gomp_barrier_wait_end.
-	* config/linux/wait.h: New file.
-	* config/linux/mutex.c: Include wait.h instead of libgomp.h and
-	futex.h.
-	(gomp_mutex_lock_slow): Call do_wait instead of futex_wait.
-	* config/linux/bar.c: Include wait.h instead of libgomp.h and
-	futex.h.
-	(gomp_barrier_wait_end): Change second argument to
-	gomp_barrier_state_t.  Call do_wait instead of futex_wait.
-	* config/linux/sem.c: Include wait.h instead of libgomp.h and
-	futex.h.
-	(gomp_sem_wait_slow): Call do_wait instead of futex_wait.
-	* config/linux/lock.c: Include wait.h instead of libgomp.h and
-	futex.h.
-	(gomp_set_nest_lock_25): Call do_wait instead of futex_wait.
-	* config/linux/affinity.c: Assume HAVE_SYNC_BUILTINS.
-	* config/linux/bar.h (gomp_barrier_state_t): New typedef.
-	(gomp_barrier_wait_end): Change second argument to
-	gomp_barrier_state_t.
-	(gomp_barrier_wait_start): Return gomp_barrier_state_t.
-	(gomp_barrier_last_thread, gomp_barrier_wait_last): New static
-	inlines.
-	* config/linux/powerpc/futex.h (cpu_relax, atomic_write_barrier): New
-	static inlines.
-	* config/linux/alpha/futex.h (cpu_relax, atomic_write_barrier):
-	Likewise.
-	* config/linux/x86/futex.h (cpu_relax, atomic_write_barrier):
-	Likewise.
-	* config/linux/s390/futex.h (cpu_relax, atomic_write_barrier):
-	Likewise.
-	* config/linux/ia64/futex.h (cpu_relax, atomic_write_barrier):
-	Likewise.
-	* config/linux/sparc/futex.h (cpu_relax, atomic_write_barrier):
-	Likewise.
-	* config/posix/bar.c (gomp_barrier_wait_end): Change second argument
-	to gomp_barrier_state_t.
-	* config/posix/bar.h (gomp_barrier_state_t): New typedef.
-	(gomp_barrier_wait_end): Change second argument to
-	gomp_barrier_state_t.
-	(gomp_barrier_wait_start): Return gomp_barrier_state_t.
-	(gomp_barrier_last_thread, gomp_barrier_wait_last): New static
-	inlines.
-
---- libgomp/parallel.c.jj	2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/parallel.c	2008-03-26 15:32:06.000000000 +0100
-@@ -68,7 +68,7 @@ void
- GOMP_parallel_start (void (*fn) (void *), void *data, unsigned num_threads)
- {
-   num_threads = gomp_resolve_num_threads (num_threads);
--  gomp_team_start (fn, data, num_threads, NULL);
-+  gomp_team_start (fn, data, num_threads, gomp_new_team (num_threads));
- }
- 
- void
---- libgomp/sections.c.jj	2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/sections.c	2008-03-26 15:33:06.000000000 +0100
-@@ -59,14 +59,24 @@ GOMP_sections_start (unsigned count)
-   long s, e, ret;
- 
-   if (gomp_work_share_start (false))
--    gomp_sections_init (thr->ts.work_share, count);
-+    {
-+      gomp_sections_init (thr->ts.work_share, count);
-+      gomp_work_share_init_done ();
-+    }
- 
-+#ifdef HAVE_SYNC_BUILTINS
-+  if (gomp_iter_dynamic_next (&s, &e))
-+    ret = s;
-+  else
-+    ret = 0;
-+#else
-+  gomp_mutex_lock (&thr->ts.work_share->lock);
-   if (gomp_iter_dynamic_next_locked (&s, &e))
-     ret = s;
-   else
-     ret = 0;
--
-   gomp_mutex_unlock (&thr->ts.work_share->lock);
-+#endif
- 
-   return ret;
- }
-@@ -83,15 +93,23 @@ GOMP_sections_start (unsigned count)
- unsigned
- GOMP_sections_next (void)
- {
--  struct gomp_thread *thr = gomp_thread ();
-   long s, e, ret;
- 
-+#ifdef HAVE_SYNC_BUILTINS
-+  if (gomp_iter_dynamic_next (&s, &e))
-+    ret = s;
-+  else
-+    ret = 0;
-+#else
-+  struct gomp_thread *thr = gomp_thread ();
-+
-   gomp_mutex_lock (&thr->ts.work_share->lock);
-   if (gomp_iter_dynamic_next_locked (&s, &e))
-     ret = s;
-   else
-     ret = 0;
-   gomp_mutex_unlock (&thr->ts.work_share->lock);
-+#endif
- 
-   return ret;
- }
-@@ -103,15 +121,15 @@ void
- GOMP_parallel_sections_start (void (*fn) (void *), void *data,
- 			      unsigned num_threads, unsigned count)
- {
--  struct gomp_work_share *ws;
-+  struct gomp_team *team;
- 
-   num_threads = gomp_resolve_num_threads (num_threads);
-   if (gomp_dyn_var && num_threads > count)
-     num_threads = count;
- 
--  ws = gomp_new_work_share (false, num_threads);
--  gomp_sections_init (ws, count);
--  gomp_team_start (fn, data, num_threads, ws);
-+  team = gomp_new_team (num_threads);
-+  gomp_sections_init (&team->work_shares[0], count);
-+  gomp_team_start (fn, data, num_threads, team);
- }
- 
- /* The GOMP_section_end* routines are called after the thread is told
---- libgomp/env.c.jj	2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/env.c	2008-03-26 16:40:26.000000000 +0100
-@@ -44,6 +44,11 @@ enum gomp_schedule_type gomp_run_sched_v
- unsigned long gomp_run_sched_chunk = 1;
- unsigned short *gomp_cpu_affinity;
- size_t gomp_cpu_affinity_len;
-+#ifndef HAVE_SYNC_BUILTINS
-+gomp_mutex_t gomp_remaining_threads_lock;
-+#endif
-+unsigned long gomp_available_cpus = 1, gomp_managed_threads = 1;
-+unsigned long long gomp_spin_count_var, gomp_throttled_spin_count_var;
- 
- /* Parse the OMP_SCHEDULE environment variable.  */
- 
-@@ -147,6 +152,79 @@ parse_unsigned_long (const char *name, u
-   return false;
- }
- 
-+/* Parse the GOMP_SPINCOUNT environment varible.  Return true if one was
-+   present and it was successfully parsed.  */
-+
-+static bool
-+parse_spincount (const char *name, unsigned long long *pvalue)
-+{
-+  char *env, *end;
-+  unsigned long long value, mult = 1;
-+
-+  env = getenv (name);
-+  if (env == NULL)
-+    return false;
-+
-+  while (isspace ((unsigned char) *env))
-+    ++env;
-+  if (*env == '\0')
-+    goto invalid;
-+
-+  if (strncasecmp (env, "infinite", 8) == 0
-+      || strncasecmp (env, "infinity", 8) == 0)
-+    {
-+      value = ~0ULL;
-+      end = env + 8;
-+      goto check_tail;
-+    }
-+
-+  errno = 0;
-+  value = strtoull (env, &end, 10);
-+  if (errno)
-+    goto invalid;
-+
-+  while (isspace ((unsigned char) *end))
-+    ++end;
-+  if (*end != '\0')
-+    {
-+      switch (tolower (*end))
-+	{
-+	case 'k':
-+	  mult = 1000LL;
-+	  break;
-+	case 'm':
-+	  mult = 1000LL * 1000LL;
-+	  break;
-+	case 'g':
-+	  mult = 1000LL * 1000LL * 1000LL;
-+	  break;
-+	case 't':
-+	  mult = 1000LL * 1000LL * 1000LL * 1000LL;
-+	  break;
-+	default:
-+	  goto invalid;
-+	}
-+      ++end;
-+     check_tail:
-+      while (isspace ((unsigned char) *end))
-+	++end;
-+      if (*end != '\0')
-+	goto invalid;
-+    }
-+
-+  if (value > ~0ULL / mult)
-+    value = ~0ULL;
-+  else
-+    value *= mult;
-+
-+  *pvalue = value;
-+  return true;
-+
-+ invalid:
-+  gomp_error ("Invalid value for environment variable %s", name);
-+  return false;
-+}
-+
- /* Parse a boolean value for environment variable NAME and store the 
-    result in VALUE.  */
- 
-@@ -281,10 +359,25 @@ initialize_env (void)
-   parse_schedule ();
-   parse_boolean ("OMP_DYNAMIC", &gomp_dyn_var);
-   parse_boolean ("OMP_NESTED", &gomp_nest_var);
-+  gomp_init_num_threads ();
-+  gomp_available_cpus = gomp_nthreads_var;
-   if (!parse_unsigned_long ("OMP_NUM_THREADS", &gomp_nthreads_var))
--    gomp_init_num_threads ();
-+    gomp_nthreads_var = gomp_available_cpus;
-   if (parse_affinity ())
-     gomp_init_affinity ();
-+  if (!parse_spincount ("GOMP_SPINCOUNT", &gomp_spin_count_var))
-+    {
-+      /* Using a rough estimation of 100000 spins per msec,
-+	 use 200 msec blocking.
-+	 Depending on the CPU speed, this can be e.g. 5 times longer
-+	 or 5 times shorter.  */
-+      gomp_spin_count_var = 20000000LL;
-+    }
-+  /* gomp_throttled_spin_count_var is used when there are more libgomp
-+     managed threads than available CPUs.  Use very short spinning.  */
-+  gomp_throttled_spin_count_var = 100LL;
-+  if (gomp_throttled_spin_count_var > gomp_spin_count_var)
-+    gomp_throttled_spin_count_var = gomp_spin_count_var;
- 
-   /* Not strictly environment related, but ordering constructors is tricky.  */
-   pthread_attr_init (&gomp_thread_attr);
---- libgomp/libgomp.h.jj	2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/libgomp.h	2008-03-27 12:21:51.000000000 +0100
-@@ -50,6 +50,7 @@
- #include "sem.h"
- #include "mutex.h"
- #include "bar.h"
-+#include "ptrlock.h"
- 
- 
- /* This structure contains the data to control one work-sharing construct,
-@@ -70,6 +71,8 @@ struct gomp_work_share
-      If this is a SECTIONS construct, this value will always be DYNAMIC.  */
-   enum gomp_schedule_type sched;
- 
-+  int mode;
-+
-   /* This is the chunk_size argument to the SCHEDULE clause.  */
-   long chunk_size;
- 
-@@ -81,17 +84,38 @@ struct gomp_work_share
-      is always 1.  */
-   long incr;
- 
--  /* This lock protects the update of the following members.  */
--  gomp_mutex_t lock;
-+  /* This is a circular queue that details which threads will be allowed
-+     into the ordered region and in which order.  When a thread allocates
-+     iterations on which it is going to work, it also registers itself at
-+     the end of the array.  When a thread reaches the ordered region, it
-+     checks to see if it is the one at the head of the queue.  If not, it
-+     blocks on its RELEASE semaphore.  */
-+  unsigned *ordered_team_ids;
- 
--  union {
--    /* This is the next iteration value to be allocated.  In the case of
--       GFS_STATIC loops, this the iteration start point and never changes.  */
--    long next;
-+  /* This is the number of threads that have registered themselves in
-+     the circular queue ordered_team_ids.  */
-+  unsigned ordered_num_used;
- 
--    /* This is the returned data structure for SINGLE COPYPRIVATE.  */
--    void *copyprivate;
--  };
-+  /* This is the team_id of the currently acknowledged owner of the ordered
-+     section, or -1u if the ordered section has not been acknowledged by
-+     any thread.  This is distinguished from the thread that is *allowed*
-+     to take the section next.  */
-+  unsigned ordered_owner;
-+
-+  /* This is the index into the circular queue ordered_team_ids of the
-+     current thread that's allowed into the ordered reason.  */
-+  unsigned ordered_cur;
-+
-+  /* This is a chain of allocated gomp_work_share blocks, valid only
-+     in the first gomp_work_share struct in the block.  */
-+  struct gomp_work_share *next_alloc;
-+
-+  /* The above fields are written once during workshare initialization,
-+     or related to ordered worksharing.  Make sure the following fields
-+     are in a different cache line.  */
-+
-+  /* This lock protects the update of the following members.  */
-+  gomp_mutex_t lock __attribute__((aligned (64)));
- 
-   /* This is the count of the number of threads that have exited the work
-      share construct.  If the construct was marked nowait, they have moved on
-@@ -99,27 +123,28 @@ struct gomp_work_share
-      of the team to exit the work share construct must deallocate it.  */
-   unsigned threads_completed;
- 
--  /* This is the index into the circular queue ordered_team_ids of the 
--     current thread that's allowed into the ordered reason.  */
--  unsigned ordered_cur;
-+  union {
-+    /* This is the next iteration value to be allocated.  In the case of
-+       GFS_STATIC loops, this the iteration start point and never changes.  */
-+    long next;
- 
--  /* This is the number of threads that have registered themselves in
--     the circular queue ordered_team_ids.  */
--  unsigned ordered_num_used;
-+    /* This is the returned data structure for SINGLE COPYPRIVATE.  */
-+    void *copyprivate;
-+  };
- 
--  /* This is the team_id of the currently acknoledged owner of the ordered
--     section, or -1u if the ordered section has not been acknowledged by
--     any thread.  This is distinguished from the thread that is *allowed*
--     to take the section next.  */
--  unsigned ordered_owner;
-+  union {
-+    /* Link to gomp_work_share struct for next work sharing construct
-+       encountered after this one.  */
-+    gomp_ptrlock_t next_ws;
-+
-+    /* gomp_work_share structs are chained in the free work share cache
-+       through this.  */
-+    struct gomp_work_share *next_free;
-+  };
- 
--  /* This is a circular queue that details which threads will be allowed
--     into the ordered region and in which order.  When a thread allocates
--     iterations on which it is going to work, it also registers itself at
--     the end of the array.  When a thread reaches the ordered region, it
--     checks to see if it is the one at the head of the queue.  If not, it
--     blocks on its RELEASE semaphore.  */
--  unsigned ordered_team_ids[];
-+  /* If only few threads are in the team, ordered_team_ids can point
-+     to this array which fills the padding at the end of this struct.  */
-+  unsigned inline_ordered_team_ids[0];
- };
- 
- /* This structure contains all of the thread-local data associated with 
-@@ -133,21 +158,24 @@ struct gomp_team_state
- 
-   /* This is the work share construct which this thread is currently
-      processing.  Recall that with NOWAIT, not all threads may be 
--     processing the same construct.  This value is NULL when there
--     is no construct being processed.  */
-+     processing the same construct.  */
-   struct gomp_work_share *work_share;
- 
-+  /* This is the previous work share construct or NULL if there wasn't any.
-+     When all threads are done with the current work sharing construct,
-+     the previous one can be freed.  The current one can't, as its
-+     next_ws field is used.  */
-+  struct gomp_work_share *last_work_share;
-+
-   /* This is the ID of this thread within the team.  This value is
-      guaranteed to be between 0 and N-1, where N is the number of
-      threads in the team.  */
-   unsigned team_id;
- 
--  /* The work share "generation" is a number that increases by one for
--     each work share construct encountered in the dynamic flow of the
--     program.  It is used to find the control data for the work share
--     when encountering it for the first time.  This particular number
--     reflects the generation of the work_share member of this struct.  */
--  unsigned work_share_generation;
-+#ifdef HAVE_SYNC_BUILTINS
-+  /* Number of single stmts encountered.  */
-+  unsigned long single_count;
-+#endif
- 
-   /* For GFS_RUNTIME loops that resolved to GFS_STATIC, this is the
-      trip number through the loop.  So first time a particular loop
-@@ -163,41 +191,53 @@ struct gomp_team_state
- 
- struct gomp_team
- {
--  /* This lock protects access to the following work shares data structures.  */
--  gomp_mutex_t work_share_lock;
--
--  /* This is a dynamically sized array containing pointers to the control
--     structs for all "live" work share constructs.  Here "live" means that
--     the construct has been encountered by at least one thread, and not
--     completed by all threads.  */
--  struct gomp_work_share **work_shares;
--
--  /* The work_shares array is indexed by "generation & generation_mask".
--     The mask will be 2**N - 1, where 2**N is the size of the array.  */
--  unsigned generation_mask;
--
--  /* These two values define the bounds of the elements of the work_shares
--     array that are currently in use.  */
--  unsigned oldest_live_gen;
--  unsigned num_live_gen;
--
-   /* This is the number of threads in the current team.  */
-   unsigned nthreads;
- 
-+  /* This is number of gomp_work_share structs that have been allocated
-+     as a block last time.  */
-+  unsigned work_share_chunk;
-+
-   /* This is the saved team state that applied to a master thread before
-      the current thread was created.  */
-   struct gomp_team_state prev_ts;
- 
--  /* This barrier is used for most synchronization of the team.  */
--  gomp_barrier_t barrier;
--
-   /* This semaphore should be used by the master thread instead of its
-      "native" semaphore in the thread structure.  Required for nested
-      parallels, as the master is a member of two teams.  */
-   gomp_sem_t master_release;
- 
--  /* This array contains pointers to the release semaphore of the threads
--     in the team.  */
-+  /* List of gomp_work_share structs chained through next_free fields.
-+     This is populated and taken off only by the first thread in the
-+     team encountering a new work sharing construct, in a critical
-+     section.  */
-+  struct gomp_work_share *work_share_list_alloc;
-+
-+  /* List of gomp_work_share structs freed by free_work_share.  New
-+     entries are atomically added to the start of the list, and
-+     alloc_work_share can safely only move all but the first entry
-+     to work_share_list alloc, as free_work_share can happen concurrently
-+     with alloc_work_share.  */
-+  struct gomp_work_share *work_share_list_free;
-+
-+#ifdef HAVE_SYNC_BUILTINS
-+  /* Number of simple single regions encountered by threads in this
-+     team.  */
-+  unsigned long single_count;
-+#else
-+  /* Mutex protecting addition of workshares to work_share_list_free.  */
-+  gomp_mutex_t work_share_list_free_lock;
-+#endif
-+
-+  /* This barrier is used for most synchronization of the team.  */
-+  gomp_barrier_t barrier;
-+
-+  /* Initial work shares, to avoid allocating any gomp_work_share
-+     structs in the common case.  */
-+  struct gomp_work_share work_shares[8];
-+
-+  /* This is an array with pointers to the release semaphore
-+     of the threads in the team.  */
-   gomp_sem_t *ordered_release[];
- };
- 
-@@ -242,6 +282,11 @@ extern bool gomp_dyn_var;
- extern bool gomp_nest_var;
- extern enum gomp_schedule_type gomp_run_sched_var;
- extern unsigned long gomp_run_sched_chunk;
-+#ifndef HAVE_SYNC_BUILTINS
-+extern gomp_mutex_t gomp_remaining_threads_lock;
-+#endif
-+extern unsigned long long gomp_spin_count_var, gomp_throttled_spin_count_var;
-+extern unsigned long gomp_available_cpus, gomp_managed_threads;
- 
- /* The attributes to be used during thread creation.  */
- extern pthread_attr_t gomp_thread_attr;
-@@ -306,17 +351,27 @@ extern unsigned gomp_dynamic_max_threads
- 
- /* team.c */
- 
-+extern struct gomp_team *gomp_new_team (unsigned);
- extern void gomp_team_start (void (*) (void *), void *, unsigned,
--			     struct gomp_work_share *);
-+			     struct gomp_team *);
- extern void gomp_team_end (void);
- 
- /* work.c */
- 
--extern struct gomp_work_share * gomp_new_work_share (bool, unsigned);
-+extern void gomp_init_work_share (struct gomp_work_share *, bool, unsigned);
-+extern void gomp_fini_work_share (struct gomp_work_share *);
- extern bool gomp_work_share_start (bool);
- extern void gomp_work_share_end (void);
- extern void gomp_work_share_end_nowait (void);
- 
-+static inline void
-+gomp_work_share_init_done (void)
-+{
-+  struct gomp_thread *thr = gomp_thread ();
-+  if (__builtin_expect (thr->ts.last_work_share != NULL, 1))
-+    gomp_ptrlock_set (&thr->ts.last_work_share->next_ws, thr->ts.work_share);
-+}
-+
- #ifdef HAVE_ATTRIBUTE_VISIBILITY
- # pragma GCC visibility pop
- #endif
---- libgomp/iter.c.jj	2008-03-26 14:48:34.000000000 +0100
-+++ libgomp/iter.c	2008-03-26 15:11:23.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -154,7 +154,7 @@ gomp_iter_dynamic_next_locked (long *pst
-   if (start == ws->end)
-     return false;
- 
--  chunk = ws->chunk_size * ws->incr;
-+  chunk = ws->chunk_size;
-   left = ws->end - start;
-   if (ws->incr < 0)
-     {
-@@ -186,11 +186,38 @@ gomp_iter_dynamic_next (long *pstart, lo
-   struct gomp_work_share *ws = thr->ts.work_share;
-   long start, end, nend, chunk, incr;
- 
--  start = ws->next;
-   end = ws->end;
-   incr = ws->incr;
--  chunk = ws->chunk_size * incr;
-+  chunk = ws->chunk_size;
-+
-+  if (__builtin_expect (ws->mode, 1))
-+    {
-+      long tmp = __sync_fetch_and_add (&ws->next, chunk);
-+      if (incr > 0)
-+	{
-+	  if (tmp >= end)
-+	    return false;
-+	  nend = tmp + chunk;
-+	  if (nend > end)
-+	    nend = end;
-+	  *pstart = tmp;
-+	  *pend = nend;
-+	  return true;
-+	}
-+      else
-+	{
-+	  if (tmp <= end)
-+	    return false;
-+	  nend = tmp + chunk;
-+	  if (nend < end)
-+	    nend = end;
-+	  *pstart = tmp;
-+	  *pend = nend;
-+	  return true;
-+	}
-+    }
- 
-+  start = ws->next;
-   while (1)
-     {
-       long left = end - start;
---- libgomp/work.c.jj	2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/work.c	2008-03-27 12:21:51.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -29,39 +29,138 @@
-    of threads.  */
- 
- #include "libgomp.h"
-+#include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
- 
- 
--/* Create a new work share structure.  */
-+/* Allocate a new work share structure, preferably from current team's
-+   free gomp_work_share cache.  */
- 
--struct gomp_work_share *
--gomp_new_work_share (bool ordered, unsigned nthreads)
-+static struct gomp_work_share *
-+alloc_work_share (struct gomp_team *team)
- {
-   struct gomp_work_share *ws;
--  size_t size;
-+  unsigned int i;
- 
--  size = sizeof (*ws);
--  if (ordered)
--    size += nthreads * sizeof (ws->ordered_team_ids[0]);
-+  /* This is called in a critical section.  */
-+  if (team->work_share_list_alloc != NULL)
-+    {
-+      ws = team->work_share_list_alloc;
-+      team->work_share_list_alloc = ws->next_free;
-+      return ws;
-+    }
- 
--  ws = gomp_malloc_cleared (size);
--  gomp_mutex_init (&ws->lock);
--  ws->ordered_owner = -1;
-+#ifdef HAVE_SYNC_BUILTINS
-+  ws = team->work_share_list_free;
-+  /* We need atomic read from work_share_list_free,
-+     as free_work_share can be called concurrently.  */
-+  __asm ("" : "+r" (ws));
-+
-+  if (ws && ws->next_free)
-+    {
-+      struct gomp_work_share *next = ws->next_free;
-+      ws->next_free = NULL;
-+      team->work_share_list_alloc = next->next_free;
-+      return next;
-+    }
-+#else
-+  gomp_mutex_lock (&team->work_share_list_free_lock);
-+  ws = team->work_share_list_free;
-+  if (ws)
-+    {
-+      team->work_share_list_alloc = ws->next_free;
-+      team->work_share_list_free = NULL;
-+      gomp_mutex_unlock (&team->work_share_list_free_lock);
-+      return ws;
-+    }
-+  gomp_mutex_unlock (&team->work_share_list_free_lock);
-+#endif
- 
-+  team->work_share_chunk *= 2;
-+  ws = gomp_malloc (team->work_share_chunk * sizeof (struct gomp_work_share));
-+  ws->next_alloc = team->work_shares[0].next_alloc;
-+  team->work_shares[0].next_alloc = ws;
-+  team->work_share_list_alloc = &ws[1];
-+  for (i = 1; i < team->work_share_chunk - 1; i++)
-+    ws[i].next_free = &ws[i + 1];
-+  ws[i].next_free = NULL;
-   return ws;
- }
- 
-+/* Initialize an already allocated struct gomp_work_share.
-+   This shouldn't touch the next_alloc field.  */
-+
-+void
-+gomp_init_work_share (struct gomp_work_share *ws, bool ordered,
-+		      unsigned nthreads)
-+{
-+  gomp_mutex_init (&ws->lock);
-+  if (__builtin_expect (ordered, 0))
-+    {
-+#define INLINE_ORDERED_TEAM_IDS_CNT \
-+  ((sizeof (struct gomp_work_share) \
-+    - offsetof (struct gomp_work_share, inline_ordered_team_ids)) \
-+   / sizeof (((struct gomp_work_share *) 0)->inline_ordered_team_ids[0]))
-+
-+      if (nthreads > INLINE_ORDERED_TEAM_IDS_CNT)
-+	ws->ordered_team_ids
-+	  = gomp_malloc (nthreads * sizeof (*ws->ordered_team_ids));
-+      else
-+	ws->ordered_team_ids = ws->inline_ordered_team_ids;
-+      memset (ws->ordered_team_ids, '\0',
-+	      nthreads * sizeof (*ws->ordered_team_ids));
-+      ws->ordered_num_used = 0;
-+      ws->ordered_owner = -1;
-+      ws->ordered_cur = 0;
-+    }
-+  else
-+    ws->ordered_team_ids = NULL;
-+  gomp_ptrlock_init (&ws->next_ws, NULL);
-+  ws->threads_completed = 0;
-+}
- 
--/* Free a work share structure.  */
-+/* Do any needed destruction of gomp_work_share fields before it
-+   is put back into free gomp_work_share cache or freed.  */
- 
--static void
--free_work_share (struct gomp_work_share *ws)
-+void
-+gomp_fini_work_share (struct gomp_work_share *ws)
- {
-   gomp_mutex_destroy (&ws->lock);
--  free (ws);
-+  if (ws->ordered_team_ids != ws->inline_ordered_team_ids)
-+    free (ws->ordered_team_ids);
-+  gomp_ptrlock_destroy (&ws->next_ws);
- }
- 
-+/* Free a work share struct, if not orphaned, put it into current
-+   team's free gomp_work_share cache.  */
-+
-+static inline void
-+free_work_share (struct gomp_team *team, struct gomp_work_share *ws)
-+{
-+  gomp_fini_work_share (ws);
-+  if (__builtin_expect (team == NULL, 0))
-+    free (ws);
-+  else
-+    {
-+      struct gomp_work_share *next_ws;
-+#ifdef HAVE_SYNC_BUILTINS
-+      do
-+	{
-+	  next_ws = team->work_share_list_free;
-+	  ws->next_free = next_ws;
-+	}
-+      while (!__sync_bool_compare_and_swap (&team->work_share_list_free,
-+					    next_ws, ws));
-+#else
-+      gomp_mutex_lock (&team->work_share_list_free_lock);
-+      next_ws = team->work_share_list_free;
-+      ws->next_free = next_ws;
-+      team->work_share_list_free = ws;
-+      gomp_mutex_unlock (&team->work_share_list_free_lock);
-+#endif
-+    }
-+}
- 
- /* The current thread is ready to begin the next work sharing construct.
-    In all cases, thr->ts.work_share is updated to point to the new
-@@ -74,71 +173,34 @@ gomp_work_share_start (bool ordered)
-   struct gomp_thread *thr = gomp_thread ();
-   struct gomp_team *team = thr->ts.team;
-   struct gomp_work_share *ws;
--  unsigned ws_index, ws_gen;
- 
-   /* Work sharing constructs can be orphaned.  */
-   if (team == NULL)
-     {
--      ws = gomp_new_work_share (ordered, 1);
-+      ws = gomp_malloc (sizeof (*ws));
-+      gomp_init_work_share (ws, ordered, 1);
-       thr->ts.work_share = ws;
--      thr->ts.static_trip = 0;
--      gomp_mutex_lock (&ws->lock);
--      return true;
-+      return ws;
-     }
- 
--  gomp_mutex_lock (&team->work_share_lock);
--
--  /* This thread is beginning its next generation.  */
--  ws_gen = ++thr->ts.work_share_generation;
--
--  /* If this next generation is not newer than any other generation in
--     the team, then simply reference the existing construct.  */
--  if (ws_gen - team->oldest_live_gen < team->num_live_gen)
-+  ws = thr->ts.work_share;
-+  thr->ts.last_work_share = ws;
-+  ws = gomp_ptrlock_get (&ws->next_ws);
-+  if (ws == NULL)
-     {
--      ws_index = ws_gen & team->generation_mask;
--      ws = team->work_shares[ws_index];
-+      /* This thread encountered a new ws first.  */
-+      struct gomp_work_share *ws = alloc_work_share (team);
-+      gomp_init_work_share (ws, ordered, team->nthreads);
-       thr->ts.work_share = ws;
--      thr->ts.static_trip = 0;
--
--      gomp_mutex_lock (&ws->lock);
--      gomp_mutex_unlock (&team->work_share_lock);
--
--      return false;
-+      return true;
-     }
--
--  /* Resize the work shares queue if we've run out of space.  */
--  if (team->num_live_gen++ == team->generation_mask)
-+  else
-     {
--      team->work_shares = gomp_realloc (team->work_shares,
--					2 * team->num_live_gen
--					* sizeof (*team->work_shares));
--
--      /* Unless oldest_live_gen is zero, the sequence of live elements
--	 wraps around the end of the array.  If we do nothing, we break
--	 lookup of the existing elements.  Fix that by unwrapping the
--	 data from the front to the end.  */
--      if (team->oldest_live_gen > 0)
--	memcpy (team->work_shares + team->num_live_gen,
--		team->work_shares,
--		(team->oldest_live_gen & team->generation_mask)
--		* sizeof (*team->work_shares));
--
--      team->generation_mask = team->generation_mask * 2 + 1;
--    }
--
--  ws_index = ws_gen & team->generation_mask;
--  ws = gomp_new_work_share (ordered, team->nthreads);
--  thr->ts.work_share = ws;
--  thr->ts.static_trip = 0;
--  team->work_shares[ws_index] = ws;
--
--  gomp_mutex_lock (&ws->lock);
--  gomp_mutex_unlock (&team->work_share_lock);
--
--  return true;
-+      thr->ts.work_share = ws;
-+      return false;
-+    }
- }
- 
--
- /* The current thread is done with its current work sharing construct.
-    This version does imply a barrier at the end of the work-share.  */
- 
-@@ -147,36 +209,28 @@ gomp_work_share_end (void)
- {
-   struct gomp_thread *thr = gomp_thread ();
-   struct gomp_team *team = thr->ts.team;
--  struct gomp_work_share *ws = thr->ts.work_share;
--  bool last;
--
--  thr->ts.work_share = NULL;
-+  gomp_barrier_state_t bstate;
- 
-   /* Work sharing constructs can be orphaned.  */
-   if (team == NULL)
-     {
--      free_work_share (ws);
-+      free_work_share (NULL, thr->ts.work_share);
-+      thr->ts.work_share = NULL;
-       return;
-     }
- 
--  last = gomp_barrier_wait_start (&team->barrier);
-+  bstate = gomp_barrier_wait_start (&team->barrier);
- 
--  if (last)
-+  if (gomp_barrier_last_thread (bstate))
-     {
--      unsigned ws_index;
--
--      ws_index = thr->ts.work_share_generation & team->generation_mask;
--      team->work_shares[ws_index] = NULL;
--      team->oldest_live_gen++;
--      team->num_live_gen = 0;
--
--      free_work_share (ws);
-+      if (__builtin_expect (thr->ts.last_work_share != NULL, 1))
-+	free_work_share (team, thr->ts.last_work_share);
-     }
- 
--  gomp_barrier_wait_end (&team->barrier, last);
-+  gomp_barrier_wait_end (&team->barrier, bstate);
-+  thr->ts.last_work_share = NULL;
- }
- 
--
- /* The current thread is done with its current work sharing construct.
-    This version does NOT imply a barrier at the end of the work-share.  */
- 
-@@ -188,15 +242,17 @@ gomp_work_share_end_nowait (void)
-   struct gomp_work_share *ws = thr->ts.work_share;
-   unsigned completed;
- 
--  thr->ts.work_share = NULL;
--
-   /* Work sharing constructs can be orphaned.  */
-   if (team == NULL)
-     {
--      free_work_share (ws);
-+      free_work_share (NULL, ws);
-+      thr->ts.work_share = NULL;
-       return;
-     }
- 
-+  if (__builtin_expect (thr->ts.last_work_share == NULL, 0))
-+    return;
-+
- #ifdef HAVE_SYNC_BUILTINS
-   completed = __sync_add_and_fetch (&ws->threads_completed, 1);
- #else
-@@ -206,18 +262,6 @@ gomp_work_share_end_nowait (void)
- #endif
- 
-   if (completed == team->nthreads)
--    {
--      unsigned ws_index;
--
--      gomp_mutex_lock (&team->work_share_lock);
--
--      ws_index = thr->ts.work_share_generation & team->generation_mask;
--      team->work_shares[ws_index] = NULL;
--      team->oldest_live_gen++;
--      team->num_live_gen--;
--
--      gomp_mutex_unlock (&team->work_share_lock);
--
--      free_work_share (ws);
--    }
-+    free_work_share (team, thr->ts.last_work_share);
-+  thr->ts.last_work_share = NULL;
- }
---- libgomp/single.c.jj	2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/single.c	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -37,10 +37,24 @@
- bool
- GOMP_single_start (void)
- {
-+#ifdef HAVE_SYNC_BUILTINS
-+  struct gomp_thread *thr = gomp_thread ();
-+  struct gomp_team *team = thr->ts.team;
-+  unsigned long single_count;
-+
-+  if (__builtin_expect (team == NULL, 0))
-+    return true;
-+
-+  single_count = thr->ts.single_count++;
-+  return __sync_bool_compare_and_swap (&team->single_count, single_count,
-+				       single_count + 1L);
-+#else
-   bool ret = gomp_work_share_start (false);
--  gomp_mutex_unlock (&gomp_thread ()->ts.work_share->lock);
-+  if (ret)
-+    gomp_work_share_init_done ();
-   gomp_work_share_end_nowait ();
-   return ret;
-+#endif
- }
- 
- /* This routine is called when first encountering a SINGLE construct that
-@@ -57,10 +71,12 @@ GOMP_single_copy_start (void)
-   void *ret;
- 
-   first = gomp_work_share_start (false);
--  gomp_mutex_unlock (&thr->ts.work_share->lock);
-   
-   if (first)
--    ret = NULL;
-+    {
-+      gomp_work_share_init_done ();
-+      ret = NULL;
-+    }
-   else
-     {
-       gomp_barrier_wait (&thr->ts.team->barrier);
---- libgomp/loop.c.jj	2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/loop.c	2008-03-26 18:47:04.000000000 +0100
-@@ -27,8 +27,9 @@
- 
- /* This file handles the LOOP (FOR/DO) construct.  */
- 
--#include "libgomp.h"
-+#include <limits.h>
- #include <stdlib.h>
-+#include "libgomp.h"
- 
- 
- /* Initialize the given work share construct from the given arguments.  */
-@@ -44,6 +45,39 @@ gomp_loop_init (struct gomp_work_share *
- 	    ? start : end;
-   ws->incr = incr;
-   ws->next = start;
-+  if (sched == GFS_DYNAMIC)
-+    {
-+      ws->chunk_size *= incr;
-+
-+#ifdef HAVE_SYNC_BUILTINS
-+      {
-+	/* For dynamic scheduling prepare things to make each iteration
-+	   faster.  */
-+	struct gomp_thread *thr = gomp_thread ();
-+	struct gomp_team *team = thr->ts.team;
-+	long nthreads = team ? team->nthreads : 1;
-+
-+	if (__builtin_expect (incr > 0, 1))
-+	  {
-+	    /* Cheap overflow protection.  */
-+	    if (__builtin_expect ((nthreads | ws->chunk_size)
-+				  >= 1UL << (sizeof (long)
-+					     * __CHAR_BIT__ / 2 - 1), 0))
-+	      ws->mode = 0;
-+	    else
-+	      ws->mode = ws->end < (LONG_MAX
-+				    - (nthreads + 1) * ws->chunk_size);
-+	  }
-+	/* Cheap overflow protection.  */
-+	else if (__builtin_expect ((nthreads | -ws->chunk_size)
-+				   >= 1UL << (sizeof (long)
-+					      * __CHAR_BIT__ / 2 - 1), 0))
-+	  ws->mode = 0;
-+	else
-+	  ws->mode = ws->end > (nthreads + 1) * -ws->chunk_size - LONG_MAX;
-+      }
-+#endif
-+    }
- }
- 
- /* The *_start routines are called when first encountering a loop construct
-@@ -68,10 +102,13 @@ gomp_loop_static_start (long start, long
- {
-   struct gomp_thread *thr = gomp_thread ();
- 
-+  thr->ts.static_trip = 0;
-   if (gomp_work_share_start (false))
--    gomp_loop_init (thr->ts.work_share, start, end, incr,
--		    GFS_STATIC, chunk_size);
--  gomp_mutex_unlock (&thr->ts.work_share->lock);
-+    {
-+      gomp_loop_init (thr->ts.work_share, start, end, incr,
-+		      GFS_STATIC, chunk_size);
-+      gomp_work_share_init_done ();
-+    }
- 
-   return !gomp_iter_static_next (istart, iend);
- }
-@@ -84,13 +121,16 @@ gomp_loop_dynamic_start (long start, lon
-   bool ret;
- 
-   if (gomp_work_share_start (false))
--    gomp_loop_init (thr->ts.work_share, start, end, incr,
--		    GFS_DYNAMIC, chunk_size);
-+    {
-+      gomp_loop_init (thr->ts.work_share, start, end, incr,
-+		      GFS_DYNAMIC, chunk_size);
-+      gomp_work_share_init_done ();
-+    }
- 
- #ifdef HAVE_SYNC_BUILTINS
--  gomp_mutex_unlock (&thr->ts.work_share->lock);
-   ret = gomp_iter_dynamic_next (istart, iend);
- #else
-+  gomp_mutex_lock (&thr->ts.work_share->lock);
-   ret = gomp_iter_dynamic_next_locked (istart, iend);
-   gomp_mutex_unlock (&thr->ts.work_share->lock);
- #endif
-@@ -106,13 +146,16 @@ gomp_loop_guided_start (long start, long
-   bool ret;
- 
-   if (gomp_work_share_start (false))
--    gomp_loop_init (thr->ts.work_share, start, end, incr,
--		    GFS_GUIDED, chunk_size);
-+    {
-+      gomp_loop_init (thr->ts.work_share, start, end, incr,
-+		      GFS_GUIDED, chunk_size);
-+      gomp_work_share_init_done ();
-+    }
- 
- #ifdef HAVE_SYNC_BUILTINS
--  gomp_mutex_unlock (&thr->ts.work_share->lock);
-   ret = gomp_iter_guided_next (istart, iend);
- #else
-+  gomp_mutex_lock (&thr->ts.work_share->lock);
-   ret = gomp_iter_guided_next_locked (istart, iend);
-   gomp_mutex_unlock (&thr->ts.work_share->lock);
- #endif
-@@ -149,13 +192,14 @@ gomp_loop_ordered_static_start (long sta
- {
-   struct gomp_thread *thr = gomp_thread ();
- 
-+  thr->ts.static_trip = 0;
-   if (gomp_work_share_start (true))
-     {
-       gomp_loop_init (thr->ts.work_share, start, end, incr,
- 		      GFS_STATIC, chunk_size);
-       gomp_ordered_static_init ();
-+      gomp_work_share_init_done ();
-     }
--  gomp_mutex_unlock (&thr->ts.work_share->lock);
- 
-   return !gomp_iter_static_next (istart, iend);
- }
-@@ -168,8 +212,14 @@ gomp_loop_ordered_dynamic_start (long st
-   bool ret;
- 
-   if (gomp_work_share_start (true))
--    gomp_loop_init (thr->ts.work_share, start, end, incr,
--		    GFS_DYNAMIC, chunk_size);
-+    {
-+      gomp_loop_init (thr->ts.work_share, start, end, incr,
-+		      GFS_DYNAMIC, chunk_size);
-+      gomp_mutex_lock (&thr->ts.work_share->lock);
-+      gomp_work_share_init_done ();
-+    }
-+  else
-+    gomp_mutex_lock (&thr->ts.work_share->lock);
- 
-   ret = gomp_iter_dynamic_next_locked (istart, iend);
-   if (ret)
-@@ -187,8 +237,14 @@ gomp_loop_ordered_guided_start (long sta
-   bool ret;
- 
-   if (gomp_work_share_start (true))
--    gomp_loop_init (thr->ts.work_share, start, end, incr,
--		    GFS_GUIDED, chunk_size);
-+    {
-+      gomp_loop_init (thr->ts.work_share, start, end, incr,
-+		      GFS_GUIDED, chunk_size);
-+      gomp_mutex_lock (&thr->ts.work_share->lock);
-+      gomp_work_share_init_done ();
-+    }
-+  else
-+    gomp_mutex_lock (&thr->ts.work_share->lock);
- 
-   ret = gomp_iter_guided_next_locked (istart, iend);
-   if (ret)
-@@ -375,12 +431,12 @@ gomp_parallel_loop_start (void (*fn) (vo
- 			  long incr, enum gomp_schedule_type sched,
- 			  long chunk_size)
- {
--  struct gomp_work_share *ws;
-+  struct gomp_team *team;
- 
-   num_threads = gomp_resolve_num_threads (num_threads);
--  ws = gomp_new_work_share (false, num_threads);
--  gomp_loop_init (ws, start, end, incr, sched, chunk_size);
--  gomp_team_start (fn, data, num_threads, ws);
-+  team = gomp_new_team (num_threads);
-+  gomp_loop_init (&team->work_shares[0], start, end, incr, sched, chunk_size);
-+  gomp_team_start (fn, data, num_threads, team);
- }
- 
- void
---- libgomp/Makefile.in.jj	2008-01-10 20:53:47.000000000 +0100
-+++ libgomp/Makefile.in	2008-03-26 18:51:01.000000000 +0100
-@@ -83,7 +83,7 @@ libgomp_la_LIBADD =
- am_libgomp_la_OBJECTS = alloc.lo barrier.lo critical.lo env.lo \
- 	error.lo iter.lo loop.lo ordered.lo parallel.lo sections.lo \
- 	single.lo team.lo work.lo lock.lo mutex.lo proc.lo sem.lo \
--	bar.lo time.lo fortran.lo affinity.lo
-+	bar.lo ptrlock.lo time.lo fortran.lo affinity.lo
- libgomp_la_OBJECTS = $(am_libgomp_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
- depcomp = $(SHELL) $(top_srcdir)/../depcomp
-@@ -292,7 +292,7 @@ libgomp_version_info = -version-info $(l
- libgomp_la_LDFLAGS = $(libgomp_version_info) $(libgomp_version_script)
- libgomp_la_SOURCES = alloc.c barrier.c critical.c env.c error.c iter.c \
- 	loop.c ordered.c parallel.c sections.c single.c team.c work.c \
--	lock.c mutex.c proc.c sem.c bar.c time.c fortran.c affinity.c
-+	lock.c mutex.c proc.c sem.c bar.c ptrlock.c time.c fortran.c affinity.c
- 
- nodist_noinst_HEADERS = libgomp_f.h
- nodist_libsubinclude_HEADERS = omp.h
-@@ -434,6 +434,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ordered.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parallel.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proc.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptrlock.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sections.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sem.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/single.Plo@am__quote@
---- libgomp/testsuite/libgomp.c/loop-4.c.jj	2008-03-26 18:47:04.000000000 +0100
-+++ libgomp/testsuite/libgomp.c/loop-4.c	2008-03-26 18:47:04.000000000 +0100
-@@ -0,0 +1,28 @@
-+/* { dg-do run } */
-+
-+extern void abort (void);
-+
-+int
-+main (void)
-+{
-+  int e = 0;
-+#pragma omp parallel num_threads (4) reduction(+:e)
-+  {
-+    long i;
-+    #pragma omp for schedule(dynamic,1)
-+    for (i = __LONG_MAX__ - 30001; i <= __LONG_MAX__ - 10001; i += 10000)
-+      if (i != __LONG_MAX__ - 30001
-+	  && i != __LONG_MAX__ - 20001
-+	  && i != __LONG_MAX__ - 10001)
-+	e = 1;
-+    #pragma omp for schedule(dynamic,1)
-+    for (i = -__LONG_MAX__ + 30000; i >= -__LONG_MAX__ + 10000; i -= 10000)
-+      if (i != -__LONG_MAX__ + 30000
-+	  && i != -__LONG_MAX__ + 20000
-+	  && i != -__LONG_MAX__ + 10000)
-+	e = 1;
-+  }
-+  if (e)
-+    abort ();
-+  return 0;
-+}
---- libgomp/Makefile.am.jj	2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/Makefile.am	2008-03-26 15:15:19.000000000 +0100
-@@ -31,7 +31,7 @@ libgomp_la_LDFLAGS = $(libgomp_version_i
- 
- libgomp_la_SOURCES = alloc.c barrier.c critical.c env.c error.c iter.c \
- 	loop.c ordered.c parallel.c sections.c single.c team.c work.c \
--	lock.c mutex.c proc.c sem.c bar.c time.c fortran.c affinity.c
-+	lock.c mutex.c proc.c sem.c bar.c ptrlock.c time.c fortran.c affinity.c
- 
- nodist_noinst_HEADERS = libgomp_f.h
- nodist_libsubinclude_HEADERS = omp.h
---- libgomp/team.c.jj	2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/team.c	2008-03-27 12:22:26.000000000 +0100
-@@ -94,7 +94,7 @@ gomp_thread_start (void *xdata)
-     {
-       gomp_barrier_wait (&thr->ts.team->barrier);
-       local_fn (local_data);
--      gomp_barrier_wait (&thr->ts.team->barrier);
-+      gomp_barrier_wait_last (&thr->ts.team->barrier);
-     }
-   else
-     {
-@@ -114,11 +114,10 @@ gomp_thread_start (void *xdata)
- 	  thr->data = NULL;
- 	  thr->ts.team = NULL;
- 	  thr->ts.work_share = NULL;
-+	  thr->ts.last_work_share = NULL;
- 	  thr->ts.team_id = 0;
--	  thr->ts.work_share_generation = 0;
--	  thr->ts.static_trip = 0;
- 
--	  gomp_barrier_wait (&team->barrier);
-+	  gomp_barrier_wait_last (&team->barrier);
- 	  gomp_barrier_wait (&gomp_threads_dock);
- 
- 	  local_fn = thr->fn;
-@@ -133,21 +132,29 @@ gomp_thread_start (void *xdata)
- 
- /* Create a new team data structure.  */
- 
--static struct gomp_team *
--new_team (unsigned nthreads, struct gomp_work_share *work_share)
-+struct gomp_team *
-+gomp_new_team (unsigned nthreads)
- {
-   struct gomp_team *team;
-   size_t size;
-+  int i;
- 
-   size = sizeof (*team) + nthreads * sizeof (team->ordered_release[0]);
-   team = gomp_malloc (size);
--  gomp_mutex_init (&team->work_share_lock);
- 
--  team->work_shares = gomp_malloc (4 * sizeof (struct gomp_work_share *));
--  team->generation_mask = 3;
--  team->oldest_live_gen = work_share == NULL;
--  team->num_live_gen = work_share != NULL;
--  team->work_shares[0] = work_share;
-+  team->work_share_chunk = 8;
-+#ifdef HAVE_SYNC_BUILTINS
-+  team->single_count = 0;
-+#else
-+  gomp_mutex_init (&team->work_share_list_free_lock);
-+#endif
-+  gomp_init_work_share (&team->work_shares[0], false, nthreads);
-+  team->work_shares[0].next_alloc = NULL;
-+  team->work_share_list_free = NULL;
-+  team->work_share_list_alloc = &team->work_shares[1];
-+  for (i = 1; i < 7; i++)
-+    team->work_shares[i].next_free = &team->work_shares[i + 1];
-+  team->work_shares[i].next_free = NULL;
- 
-   team->nthreads = nthreads;
-   gomp_barrier_init (&team->barrier, nthreads);
-@@ -164,10 +171,22 @@ new_team (unsigned nthreads, struct gomp
- static void
- free_team (struct gomp_team *team)
- {
--  free (team->work_shares);
--  gomp_mutex_destroy (&team->work_share_lock);
-+  if (__builtin_expect (team->work_shares[0].next_alloc != NULL, 0))
-+    {
-+      struct gomp_work_share *ws = team->work_shares[0].next_alloc;
-+      do
-+	{
-+	  struct gomp_work_share *next_ws = ws->next_alloc;
-+	  free (ws);
-+	  ws = next_ws;
-+	}
-+      while (ws != NULL);
-+    }
-   gomp_barrier_destroy (&team->barrier);
-   gomp_sem_destroy (&team->master_release);
-+#ifndef HAVE_SYNC_BUILTINS
-+  gomp_mutex_destroy (&team->work_share_list_free_lock);
-+#endif
-   free (team);
- }
- 
-@@ -176,11 +195,10 @@ free_team (struct gomp_team *team)
- 
- void
- gomp_team_start (void (*fn) (void *), void *data, unsigned nthreads,
--		 struct gomp_work_share *work_share)
-+		 struct gomp_team *team)
- {
-   struct gomp_thread_start_data *start_data;
-   struct gomp_thread *thr, *nthr;
--  struct gomp_team *team;
-   bool nested;
-   unsigned i, n, old_threads_used = 0;
-   pthread_attr_t thread_attr, *attr;
-@@ -188,17 +206,18 @@ gomp_team_start (void (*fn) (void *), vo
-   thr = gomp_thread ();
-   nested = thr->ts.team != NULL;
- 
--  team = new_team (nthreads, work_share);
--
-   /* Always save the previous state, even if this isn't a nested team.
-      In particular, we should save any work share state from an outer
-      orphaned work share construct.  */
-   team->prev_ts = thr->ts;
- 
-   thr->ts.team = team;
--  thr->ts.work_share = work_share;
-   thr->ts.team_id = 0;
--  thr->ts.work_share_generation = 0;
-+  thr->ts.work_share = &team->work_shares[0];
-+  thr->ts.last_work_share = NULL;
-+#ifdef HAVE_SYNC_BUILTINS
-+  thr->ts.single_count = 0;
-+#endif
-   thr->ts.static_trip = 0;
- 
-   if (nthreads == 1)
-@@ -241,9 +260,12 @@ gomp_team_start (void (*fn) (void *), vo
- 	{
- 	  nthr = gomp_threads[i];
- 	  nthr->ts.team = team;
--	  nthr->ts.work_share = work_share;
-+	  nthr->ts.work_share = &team->work_shares[0];
-+	  nthr->ts.last_work_share = NULL;
- 	  nthr->ts.team_id = i;
--	  nthr->ts.work_share_generation = 0;
-+#ifdef HAVE_SYNC_BUILTINS
-+	  nthr->ts.single_count = 0;
-+#endif
- 	  nthr->ts.static_trip = 0;
- 	  nthr->fn = fn;
- 	  nthr->data = data;
-@@ -266,8 +288,24 @@ gomp_team_start (void (*fn) (void *), vo
- 	}
-     }
- 
-+  if (__builtin_expect (nthreads > old_threads_used, 0))
-+    {
-+      long diff = (long) nthreads - (long) old_threads_used;
-+
-+      if (old_threads_used == 0)
-+	--diff;
-+
-+#ifdef HAVE_SYNC_BUILTINS
-+      __sync_fetch_and_add (&gomp_managed_threads, diff);
-+#else
-+      gomp_mutex_lock (&gomp_remaining_threads_lock);
-+      gomp_managed_threads += diff;
-+      gomp_mutex_unlock (&gomp_remaining_threads_lock);
-+#endif
-+    }
-+
-   attr = &gomp_thread_attr;
--  if (gomp_cpu_affinity != NULL)
-+  if (__builtin_expect (gomp_cpu_affinity != NULL, 0))
-     {
-       size_t stacksize;
-       pthread_attr_init (&thread_attr);
-@@ -287,9 +325,12 @@ gomp_team_start (void (*fn) (void *), vo
-       int err;
- 
-       start_data->ts.team = team;
--      start_data->ts.work_share = work_share;
-+      start_data->ts.work_share = &team->work_shares[0];
-+      start_data->ts.last_work_share = NULL;
-       start_data->ts.team_id = i;
--      start_data->ts.work_share_generation = 0;
-+#ifdef HAVE_SYNC_BUILTINS
-+      start_data->ts.single_count = 0;
-+#endif
-       start_data->ts.static_trip = 0;
-       start_data->fn = fn;
-       start_data->fn_data = data;
-@@ -303,7 +344,7 @@ gomp_team_start (void (*fn) (void *), vo
- 	gomp_fatal ("Thread creation failed: %s", strerror (err));
-     }
- 
--  if (gomp_cpu_affinity != NULL)
-+  if (__builtin_expect (gomp_cpu_affinity != NULL, 0))
-     pthread_attr_destroy (&thread_attr);
- 
-  do_release:
-@@ -313,8 +354,20 @@ gomp_team_start (void (*fn) (void *), vo
-      that should arrive back at the end of this team.  The extra
-      threads should be exiting.  Note that we arrange for this test
-      to never be true for nested teams.  */
--  if (nthreads < old_threads_used)
--    gomp_barrier_reinit (&gomp_threads_dock, nthreads);
-+  if (__builtin_expect (nthreads < old_threads_used, 0))
-+    {
-+      long diff = (long) nthreads - (long) old_threads_used;
-+
-+      gomp_barrier_reinit (&gomp_threads_dock, nthreads);
-+
-+#ifdef HAVE_SYNC_BUILTINS
-+      __sync_fetch_and_add (&gomp_managed_threads, diff);
-+#else
-+      gomp_mutex_lock (&gomp_remaining_threads_lock);
-+      gomp_managed_threads += diff;
-+      gomp_mutex_unlock (&gomp_remaining_threads_lock);
-+#endif
-+    }
- }
- 
- 
-@@ -329,8 +382,21 @@ gomp_team_end (void)
- 
-   gomp_barrier_wait (&team->barrier);
- 
-+  gomp_fini_work_share (thr->ts.work_share);
-+
-   thr->ts = team->prev_ts;
- 
-+  if (__builtin_expect (thr->ts.team != NULL, 0))
-+    {
-+#ifdef HAVE_SYNC_BUILTINS
-+      __sync_fetch_and_add (&gomp_managed_threads, 1L - team->nthreads);
-+#else
-+      gomp_mutex_lock (&gomp_remaining_threads_lock);
-+      gomp_managed_threads -= team->nthreads - 1L;
-+      gomp_mutex_unlock (&gomp_remaining_threads_lock);
-+#endif
-+    }
-+
-   free_team (team);
- }
- 
---- libgomp/config/posix/bar.h.jj	2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/config/posix/bar.h	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -46,18 +46,32 @@ typedef struct
-   unsigned total;
-   unsigned arrived;
- } gomp_barrier_t;
-+typedef bool gomp_barrier_state_t;
- 
- extern void gomp_barrier_init (gomp_barrier_t *, unsigned);
- extern void gomp_barrier_reinit (gomp_barrier_t *, unsigned);
- extern void gomp_barrier_destroy (gomp_barrier_t *);
- 
- extern void gomp_barrier_wait (gomp_barrier_t *);
--extern void gomp_barrier_wait_end (gomp_barrier_t *, bool);
-+extern void gomp_barrier_wait_end (gomp_barrier_t *, gomp_barrier_state_t);
- 
--static inline bool gomp_barrier_wait_start (gomp_barrier_t *bar)
-+static inline gomp_barrier_state_t
-+gomp_barrier_wait_start (gomp_barrier_t *bar)
- {
-   gomp_mutex_lock (&bar->mutex1);
-   return ++bar->arrived == bar->total;
- }
- 
-+static inline bool
-+gomp_barrier_last_thread (gomp_barrier_state_t state)
-+{
-+  return state;
-+}
-+
-+static inline void
-+gomp_barrier_wait_last (gomp_barrier_t *bar)
-+{
-+  gomp_barrier_wait (bar);
-+}
-+
- #endif /* GOMP_BARRIER_H */
---- libgomp/config/posix/ptrlock.h.jj	2008-03-26 15:11:32.000000000 +0100
-+++ libgomp/config/posix/ptrlock.h	2008-03-26 15:11:32.000000000 +0100
-@@ -0,0 +1,69 @@
-+/* Copyright (C) 2008 Free Software Foundation, Inc.
-+   Contributed by Jakub Jelinek <jakub@redhat.com>.
-+
-+   This file is part of the GNU OpenMP Library (libgomp).
-+
-+   Libgomp is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU Lesser General Public License as published by
-+   the Free Software Foundation; either version 2.1 of the License, or
-+   (at your option) any later version.
-+
-+   Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY
-+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+   FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
-+   more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License 
-+   along with libgomp; see the file COPYING.LIB.  If not, write to the
-+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+/* As a special exception, if you link this library with other files, some
-+   of which are compiled with GCC, to produce an executable, this library
-+   does not by itself cause the resulting executable to be covered by the
-+   GNU General Public License.  This exception does not however invalidate
-+   any other reasons why the executable file might be covered by the GNU
-+   General Public License.  */
-+
-+/* This is a Linux specific implementation of a mutex synchronization
-+   mechanism for libgomp.  This type is private to the library.  This
-+   implementation uses atomic instructions and the futex syscall.  */
-+
-+#ifndef GOMP_PTRLOCK_H
-+#define GOMP_PTRLOCK_H 1
-+
-+typedef struct { void *ptr; gomp_mutex_t lock; } gomp_ptrlock_t;
-+
-+static inline void gomp_ptrlock_init (gomp_ptrlock_t *ptrlock, void *ptr)
-+{
-+  ptrlock->ptr = ptr;
-+  gomp_mutex_init (&ptrlock->lock);
-+}
-+
-+static inline void *gomp_ptrlock_get (gomp_ptrlock_t *ptrlock)
-+{
-+  if (ptrlock->ptr != NULL)
-+    return ptrlock->ptr;
-+
-+  gomp_mutex_lock (&ptrlock->lock);
-+  if (ptrlock->ptr != NULL)
-+    {
-+      gomp_mutex_unlock (&ptrlock->lock);
-+      return ptrlock->ptr;
-+    }
-+
-+  return NULL;
-+}
-+
-+static inline void gomp_ptrlock_set (gomp_ptrlock_t *ptrlock, void *ptr)
-+{
-+  ptrlock->ptr = ptr;
-+  gomp_mutex_unlock (&ptrlock->lock);
-+}
-+
-+static inline void gomp_ptrlock_destroy (gomp_ptrlock_t *ptrlock)
-+{
-+  gomp_mutex_destroy (&ptrlock->lock);
-+}
-+
-+#endif /* GOMP_PTRLOCK_H */
---- libgomp/config/posix/ptrlock.c.jj	2008-03-26 15:11:32.000000000 +0100
-+++ libgomp/config/posix/ptrlock.c	2008-03-26 15:11:32.000000000 +0100
-@@ -0,0 +1 @@
-+/* Everything is in the header.  */
---- libgomp/config/posix/bar.c.jj	2007-12-07 14:41:01.000000000 +0100
-+++ libgomp/config/posix/bar.c	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -70,7 +70,7 @@ gomp_barrier_reinit (gomp_barrier_t *bar
- }
- 
- void
--gomp_barrier_wait_end (gomp_barrier_t *bar, bool last)
-+gomp_barrier_wait_end (gomp_barrier_t *bar, gomp_barrier_state_t last)
- {
-   unsigned int n;
- 
---- libgomp/config/linux/alpha/futex.h.jj	2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/alpha/futex.h	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -30,8 +30,6 @@
- #ifndef SYS_futex
- #define SYS_futex               394
- #endif
--#define FUTEX_WAIT              0
--#define FUTEX_WAKE              1
- 
- 
- static inline void
-@@ -45,7 +43,7 @@ futex_wait (int *addr, int val)
- 
-   sc_0 = SYS_futex;
-   sc_16 = (long) addr;
--  sc_17 = FUTEX_WAIT;
-+  sc_17 = gomp_futex_wait;
-   sc_18 = val;
-   sc_19 = 0;
-   __asm volatile ("callsys"
-@@ -53,6 +51,20 @@ futex_wait (int *addr, int val)
- 		  : "0"(sc_0), "r" (sc_16), "r"(sc_17), "r"(sc_18), "1"(sc_19)
- 		  : "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8",
- 		    "$22", "$23", "$24", "$25", "$27", "$28", "memory");
-+  if (__builtin_expect (sc_19, 0) && sc_0 == ENOSYS)
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      sc_0 = SYS_futex;
-+      sc_17 &= ~FUTEX_PRIVATE_FLAG;
-+      sc_19 = 0;
-+      __asm volatile ("callsys"
-+		      : "=r" (sc_0), "=r"(sc_19)
-+		      : "0"(sc_0), "r" (sc_16), "r"(sc_17), "r"(sc_18),
-+			"1"(sc_19)
-+		      : "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8",
-+			"$22", "$23", "$24", "$25", "$27", "$28", "memory");
-+    }
- }
- 
- static inline void
-@@ -66,11 +78,35 @@ futex_wake (int *addr, int count)
- 
-   sc_0 = SYS_futex;
-   sc_16 = (long) addr;
--  sc_17 = FUTEX_WAKE;
-+  sc_17 = gomp_futex_wake;
-   sc_18 = count;
-   __asm volatile ("callsys"
- 		  : "=r" (sc_0), "=r"(sc_19)
- 		  : "0"(sc_0), "r" (sc_16), "r"(sc_17), "r"(sc_18)
- 		  : "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8",
- 		    "$22", "$23", "$24", "$25", "$27", "$28", "memory");
-+  if (__builtin_expect (sc_19, 0) && sc_0 == ENOSYS)
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      sc_0 = SYS_futex;
-+      sc_17 &= ~FUTEX_PRIVATE_FLAG;
-+      __asm volatile ("callsys"
-+		      : "=r" (sc_0), "=r"(sc_19)
-+		      : "0"(sc_0), "r" (sc_16), "r"(sc_17), "r"(sc_18)
-+		      : "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8",
-+			"$22", "$23", "$24", "$25", "$27", "$28", "memory");
-+    }
-+}
-+
-+static inline void
-+cpu_relax (void)
-+{
-+  __asm volatile ("" : : : "memory");
-+}
-+
-+static inline void
-+atomic_write_barrier (void)
-+{
-+  __asm volatile ("wmb" : : : "memory");
- }
---- libgomp/config/linux/affinity.c.jj	2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/affinity.c	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-+/* Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
-    Contributed by Jakub Jelinek <jakub@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -38,9 +38,6 @@
- #ifdef HAVE_PTHREAD_AFFINITY_NP
- 
- static unsigned int affinity_counter;
--#ifndef HAVE_SYNC_BUILTINS
--static gomp_mutex_t affinity_lock;
--#endif
- 
- void
- gomp_init_affinity (void)
-@@ -76,9 +73,6 @@ gomp_init_affinity (void)
-   CPU_SET (gomp_cpu_affinity[0], &cpuset);
-   pthread_setaffinity_np (pthread_self (), sizeof (cpuset), &cpuset);
-   affinity_counter = 1;
--#ifndef HAVE_SYNC_BUILTINS
--  gomp_mutex_init (&affinity_lock);
--#endif
- }
- 
- void
-@@ -87,13 +81,7 @@ gomp_init_thread_affinity (pthread_attr_
-   unsigned int cpu;
-   cpu_set_t cpuset;
- 
--#ifdef HAVE_SYNC_BUILTINS
-   cpu = __sync_fetch_and_add (&affinity_counter, 1);
--#else
--  gomp_mutex_lock (&affinity_lock);
--  cpu = affinity_counter++;
--  gomp_mutex_unlock (&affinity_lock);
--#endif
-   cpu %= gomp_cpu_affinity_len;
-   CPU_ZERO (&cpuset);
-   CPU_SET (gomp_cpu_affinity[cpu], &cpuset);
---- libgomp/config/linux/bar.h.jj	2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/bar.h	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -36,40 +36,49 @@
- 
- typedef struct
- {
--  gomp_mutex_t mutex;
--  unsigned total;
--  unsigned arrived;
--  int generation;
-+  /* Make sure total/generation is in a mostly read cacheline, while
-+     awaited in a separate cacheline.  */
-+  unsigned total __attribute__((aligned (64)));
-+  unsigned generation;
-+  unsigned awaited __attribute__((aligned (64)));
- } gomp_barrier_t;
-+typedef unsigned int gomp_barrier_state_t;
- 
- static inline void gomp_barrier_init (gomp_barrier_t *bar, unsigned count)
- {
--  gomp_mutex_init (&bar->mutex);
-   bar->total = count;
--  bar->arrived = 0;
-+  bar->awaited = count;
-   bar->generation = 0;
- }
- 
- static inline void gomp_barrier_reinit (gomp_barrier_t *bar, unsigned count)
- {
--  gomp_mutex_lock (&bar->mutex);
-+  __sync_fetch_and_add (&bar->awaited, count - bar->total);
-   bar->total = count;
--  gomp_mutex_unlock (&bar->mutex);
- }
- 
- static inline void gomp_barrier_destroy (gomp_barrier_t *bar)
- {
--  /* Before destroying, make sure all threads have left the barrier.  */
--  gomp_mutex_lock (&bar->mutex);
- }
- 
- extern void gomp_barrier_wait (gomp_barrier_t *);
--extern void gomp_barrier_wait_end (gomp_barrier_t *, bool);
-+extern void gomp_barrier_wait_last (gomp_barrier_t *);
-+extern void gomp_barrier_wait_end (gomp_barrier_t *, gomp_barrier_state_t);
- 
--static inline bool gomp_barrier_wait_start (gomp_barrier_t *bar)
-+static inline gomp_barrier_state_t
-+gomp_barrier_wait_start (gomp_barrier_t *bar)
- {
--  gomp_mutex_lock (&bar->mutex);
--  return ++bar->arrived == bar->total;
-+  unsigned int ret = bar->generation;
-+  /* Do we need any barrier here or is __sync_add_and_fetch acting
-+     as the needed LoadLoad barrier already?  */
-+  ret += __sync_add_and_fetch (&bar->awaited, -1) == 0;
-+  return ret;
-+}
-+
-+static inline bool
-+gomp_barrier_last_thread (gomp_barrier_state_t state)
-+{
-+  return state & 1;
- }
- 
- #endif /* GOMP_BARRIER_H */
---- libgomp/config/linux/ptrlock.h.jj	2008-03-26 15:11:32.000000000 +0100
-+++ libgomp/config/linux/ptrlock.h	2008-03-26 15:11:32.000000000 +0100
-@@ -0,0 +1,65 @@
-+/* Copyright (C) 2008 Free Software Foundation, Inc.
-+   Contributed by Jakub Jelinek <jakub@redhat.com>.
-+
-+   This file is part of the GNU OpenMP Library (libgomp).
-+
-+   Libgomp is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU Lesser General Public License as published by
-+   the Free Software Foundation; either version 2.1 of the License, or
-+   (at your option) any later version.
-+
-+   Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY
-+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+   FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
-+   more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License 
-+   along with libgomp; see the file COPYING.LIB.  If not, write to the
-+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+/* As a special exception, if you link this library with other files, some
-+   of which are compiled with GCC, to produce an executable, this library
-+   does not by itself cause the resulting executable to be covered by the
-+   GNU General Public License.  This exception does not however invalidate
-+   any other reasons why the executable file might be covered by the GNU
-+   General Public License.  */
-+
-+/* This is a Linux specific implementation of a mutex synchronization
-+   mechanism for libgomp.  This type is private to the library.  This
-+   implementation uses atomic instructions and the futex syscall.  */
-+
-+#ifndef GOMP_PTRLOCK_H
-+#define GOMP_PTRLOCK_H 1
-+
-+typedef void *gomp_ptrlock_t;
-+
-+static inline void gomp_ptrlock_init (gomp_ptrlock_t *ptrlock, void *ptr)
-+{
-+  *ptrlock = ptr;
-+}
-+
-+extern void *gomp_ptrlock_get_slow (gomp_ptrlock_t *ptrlock);
-+static inline void *gomp_ptrlock_get (gomp_ptrlock_t *ptrlock)
-+{
-+  if ((uintptr_t) *ptrlock > 2)
-+    return *ptrlock;
-+
-+  if (__sync_bool_compare_and_swap (ptrlock, NULL, (uintptr_t) 1))
-+    return NULL;
-+
-+  return gomp_ptrlock_get_slow (ptrlock);
-+}
-+
-+extern void gomp_ptrlock_set_slow (gomp_ptrlock_t *ptrlock, void *ptr);
-+static inline void gomp_ptrlock_set (gomp_ptrlock_t *ptrlock, void *ptr)
-+{
-+  if (!__sync_bool_compare_and_swap (ptrlock, (uintptr_t) 1, ptr))
-+    gomp_ptrlock_set_slow (ptrlock, ptr);
-+}
-+
-+static inline void gomp_ptrlock_destroy (gomp_ptrlock_t *ptrlock)
-+{
-+}
-+
-+#endif /* GOMP_PTRLOCK_H */
---- libgomp/config/linux/lock.c.jj	2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/lock.c	2008-03-26 15:11:32.000000000 +0100
-@@ -29,11 +29,10 @@
-    primitives.  This implementation uses atomic instructions and the futex
-    syscall.  */
- 
--#include "libgomp.h"
- #include <string.h>
- #include <unistd.h>
- #include <sys/syscall.h>
--#include "futex.h"
-+#include "wait.h"
- 
- 
- /* The internal gomp_mutex_t and the external non-recursive omp_lock_t
-@@ -137,7 +136,7 @@ omp_set_nest_lock (omp_nest_lock_t *lock
- 	  return;
- 	}
- 
--      futex_wait (&lock->owner, otid);
-+      do_wait (&lock->owner, otid);
-     }
- }
- 
---- libgomp/config/linux/ptrlock.c.jj	2008-03-26 15:11:32.000000000 +0100
-+++ libgomp/config/linux/ptrlock.c	2008-03-26 15:11:32.000000000 +0100
-@@ -0,0 +1,70 @@
-+/* Copyright (C) 2008 Free Software Foundation, Inc.
-+   Contributed by Jakub Jelinek <jakub@redhat.com>.
-+
-+   This file is part of the GNU OpenMP Library (libgomp).
-+
-+   Libgomp is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU Lesser General Public License as published by
-+   the Free Software Foundation; either version 2.1 of the License, or
-+   (at your option) any later version.
-+
-+   Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY
-+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+   FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
-+   more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License 
-+   along with libgomp; see the file COPYING.LIB.  If not, write to the
-+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+/* As a special exception, if you link this library with other files, some
-+   of which are compiled with GCC, to produce an executable, this library
-+   does not by itself cause the resulting executable to be covered by the
-+   GNU General Public License.  This exception does not however invalidate
-+   any other reasons why the executable file might be covered by the GNU
-+   General Public License.  */
-+
-+/* This is a Linux specific implementation of a mutex synchronization
-+   mechanism for libgomp.  This type is private to the library.  This
-+   implementation uses atomic instructions and the futex syscall.  */
-+
-+#include <endian.h>
-+#include <limits.h>
-+#include "wait.h"
-+
-+void *
-+gomp_ptrlock_get_slow (gomp_ptrlock_t *ptrlock)
-+{
-+  int *intptr;
-+  __sync_bool_compare_and_swap (ptrlock, 1, 2);
-+
-+  /* futex works on ints, not pointers.
-+     But a valid work share pointer will be at least
-+     8 byte aligned, so it is safe to assume the low
-+     32-bits of the pointer won't contain values 1 or 2.  */
-+  __asm volatile ("" : "=r" (intptr) : "0" (ptrlock));
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+  if (sizeof (*ptrlock) > sizeof (int))
-+    intptr += (sizeof (*ptrlock) / sizeof (int)) - 1;
-+#endif
-+  do
-+    do_wait (intptr, 2);
-+  while (*intptr == 2);
-+  __asm volatile ("" : : : "memory");
-+  return *ptrlock;
-+}
-+
-+void
-+gomp_ptrlock_set_slow (gomp_ptrlock_t *ptrlock, void *ptr)
-+{
-+  int *intptr;
-+
-+  *ptrlock = ptr;
-+  __asm volatile ("" : "=r" (intptr) : "0" (ptrlock));
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+  if (sizeof (*ptrlock) > sizeof (int))
-+    intptr += (sizeof (*ptrlock) / sizeof (int)) - 1;
-+#endif
-+  futex_wake (intptr, INT_MAX);
-+}
---- libgomp/config/linux/x86/futex.h.jj	2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/x86/futex.h	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -27,9 +27,6 @@
- 
- /* Provide target-specific access to the futex system call.  */
- 
--#define FUTEX_WAIT	0
--#define FUTEX_WAKE	1
--
- #ifdef __LP64__
- # ifndef SYS_futex
- #  define SYS_futex	202
-@@ -38,14 +35,26 @@
- static inline void
- futex_wait (int *addr, int val)
- {
--  register long r10 __asm__("%r10") = 0;
-+  register long r10 __asm__("%r10");
-   long res;
- 
-+  r10 = 0;
-   __asm volatile ("syscall"
- 		  : "=a" (res)
--		  : "0"(SYS_futex), "D" (addr), "S"(FUTEX_WAIT),
--		    "d"(val), "r"(r10)
-+		  : "0" (SYS_futex), "D" (addr), "S" (gomp_futex_wait),
-+		    "d" (val), "r" (r10)
- 		  : "r11", "rcx", "memory");
-+  if (__builtin_expect (res == -ENOSYS, 0))
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      r10 = 0;
-+      __asm volatile ("syscall"
-+		      : "=a" (res)
-+		      : "0" (SYS_futex), "D" (addr), "S" (gomp_futex_wait),
-+			"d" (val), "r" (r10)
-+		      : "r11", "rcx", "memory");
-+    }
- }
- 
- static inline void
-@@ -55,8 +64,19 @@ futex_wake (int *addr, int count)
- 
-   __asm volatile ("syscall"
- 		  : "=a" (res)
--		  : "0"(SYS_futex), "D" (addr), "S"(FUTEX_WAKE), "d"(count)
-+		  : "0" (SYS_futex), "D" (addr), "S" (gomp_futex_wake),
-+		    "d" (count)
- 		  : "r11", "rcx", "memory");
-+  if (__builtin_expect (res == -ENOSYS, 0))
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      __asm volatile ("syscall"
-+		      : "=a" (res)
-+		      : "0" (SYS_futex), "D" (addr), "S" (gomp_futex_wake),
-+			"d" (count)
-+		      : "r11", "rcx", "memory");
-+    }
- }
- #else
- # ifndef SYS_futex
-@@ -65,7 +85,7 @@ futex_wake (int *addr, int count)
- 
- # ifdef __PIC__
- 
--static inline void
-+static inline long
- sys_futex0 (int *addr, int op, int val)
- {
-   long res;
-@@ -77,11 +97,12 @@ sys_futex0 (int *addr, int op, int val)
- 		  : "0"(SYS_futex), "r" (addr), "c"(op),
- 		    "d"(val), "S"(0)
- 		  : "memory");
-+  return res;
- }
- 
- # else
- 
--static inline void
-+static inline long
- sys_futex0 (int *addr, int op, int val)
- {
-   long res;
-@@ -91,6 +112,7 @@ sys_futex0 (int *addr, int op, int val)
- 		  : "0"(SYS_futex), "b" (addr), "c"(op),
- 		    "d"(val), "S"(0)
- 		  : "memory");
-+  return res;
- }
- 
- # endif /* __PIC__ */
-@@ -98,13 +120,37 @@ sys_futex0 (int *addr, int op, int val)
- static inline void
- futex_wait (int *addr, int val)
- {
--  sys_futex0 (addr, FUTEX_WAIT, val);
-+  long res = sys_futex0 (addr, gomp_futex_wait, val);
-+  if (__builtin_expect (res == -ENOSYS, 0))
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      sys_futex0 (addr, gomp_futex_wait, val);
-+    }
- }
- 
- static inline void
- futex_wake (int *addr, int count)
- {
--  sys_futex0 (addr, FUTEX_WAKE, count);
-+  long res = sys_futex0 (addr, gomp_futex_wake, count);
-+  if (__builtin_expect (res == -ENOSYS, 0))
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      sys_futex0 (addr, gomp_futex_wake, count);
-+    }
- }
- 
- #endif /* __LP64__ */
-+
-+static inline void
-+cpu_relax (void)
-+{
-+  __asm volatile ("rep; nop" : : : "memory");
-+}
-+
-+static inline void
-+atomic_write_barrier (void)
-+{
-+  __sync_synchronize ();
-+}
---- libgomp/config/linux/wait.h.jj	2008-03-26 15:11:32.000000000 +0100
-+++ libgomp/config/linux/wait.h	2008-03-26 15:11:32.000000000 +0100
-@@ -0,0 +1,68 @@
-+/* Copyright (C) 2008 Free Software Foundation, Inc.
-+   Contributed by Jakub Jelinek <jakub@redhat.com>.
-+
-+   This file is part of the GNU OpenMP Library (libgomp).
-+
-+   Libgomp is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU Lesser General Public License as published by
-+   the Free Software Foundation; either version 2.1 of the License, or
-+   (at your option) any later version.
-+
-+   Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY
-+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+   FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
-+   more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License 
-+   along with libgomp; see the file COPYING.LIB.  If not, write to the
-+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+/* As a special exception, if you link this library with other files, some
-+   of which are compiled with GCC, to produce an executable, this library
-+   does not by itself cause the resulting executable to be covered by the
-+   GNU General Public License.  This exception does not however invalidate
-+   any other reasons why the executable file might be covered by the GNU
-+   General Public License.  */
-+
-+/* This is a Linux specific implementation of a mutex synchronization
-+   mechanism for libgomp.  This type is private to the library.  This
-+   implementation uses atomic instructions and the futex syscall.  */
-+
-+#ifndef GOMP_WAIT_H
-+#define GOMP_WAIT_H 1
-+
-+#include "libgomp.h"
-+#include <errno.h>
-+
-+#define FUTEX_WAIT	0
-+#define FUTEX_WAKE	1
-+#define FUTEX_PRIVATE_FLAG	128L
-+
-+#ifdef HAVE_ATTRIBUTE_VISIBILITY
-+# pragma GCC visibility push(hidden)
-+#endif
-+
-+extern long int gomp_futex_wait, gomp_futex_wake;
-+
-+#include "futex.h"
-+
-+static inline void do_wait (int *addr, int val)
-+{
-+  unsigned long long i, count = gomp_spin_count_var;
-+
-+  if (__builtin_expect (gomp_managed_threads > gomp_available_cpus, 0))
-+    count = gomp_throttled_spin_count_var;
-+  for (i = 0; i < count; i++)
-+    if (__builtin_expect (*addr != val, 0))
-+      return;
-+    else
-+      cpu_relax ();
-+  futex_wait (addr, val);
-+}
-+
-+#ifdef HAVE_ATTRIBUTE_VISIBILITY
-+# pragma GCC visibility pop
-+#endif
-+
-+#endif /* GOMP_WAIT_H */
---- libgomp/config/linux/sparc/futex.h.jj	2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/sparc/futex.h	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Jakub Jelinek <jakub@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -28,10 +28,8 @@
- /* Provide target-specific access to the futex system call.  */
- 
- #include <sys/syscall.h>
--#define FUTEX_WAIT	0
--#define FUTEX_WAKE	1
- 
--static inline void
-+static inline long
- sys_futex0 (int *addr, int op, int val)
- {
-   register long int g1  __asm__ ("g1");
-@@ -47,9 +45,9 @@ sys_futex0 (int *addr, int op, int val)
-   o3 = 0;
- 
- #ifdef __arch64__
--# define SYSCALL_STRING "ta\t0x6d"
-+# define SYSCALL_STRING "ta\t0x6d; bcs,a,pt %%xcc, 1f; sub %%g0, %%o0, %%o0; 1:"
- #else
--# define SYSCALL_STRING "ta\t0x10"
-+# define SYSCALL_STRING "ta\t0x10; bcs,a 1f; sub %%g0, %%o0, %%o0; 1:"
- #endif
- 
-   __asm volatile (SYSCALL_STRING
-@@ -65,16 +63,49 @@ sys_futex0 (int *addr, int op, int val)
- 		    "f48", "f50", "f52", "f54", "f56", "f58", "f60", "f62",
- #endif
- 		    "cc", "memory");
-+  return o0;
- }
- 
- static inline void
- futex_wait (int *addr, int val)
- {
--  sys_futex0 (addr, FUTEX_WAIT, val);
-+  long err = sys_futex0 (addr, gomp_futex_wait, val);
-+  if (__builtin_expect (err == ENOSYS, 0))
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      sys_futex0 (addr, gomp_futex_wait, val);
-+    }
- }
- 
- static inline void
- futex_wake (int *addr, int count)
- {
--  sys_futex0 (addr, FUTEX_WAKE, count);
-+  long err = sys_futex0 (addr, gomp_futex_wake, count);
-+  if (__builtin_expect (err == ENOSYS, 0))
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      sys_futex0 (addr, gomp_futex_wake, count);
-+    }
-+}
-+
-+static inline void
-+cpu_relax (void)
-+{
-+#if defined __arch64__ || defined  __sparc_v9__
-+  __asm volatile ("membar #LoadLoad" : : : "memory");
-+#else
-+  __asm volatile ("" : : : "memory");
-+#endif
-+}
-+
-+static inline void
-+atomic_write_barrier (void)
-+{
-+#if defined __arch64__ || defined __sparc_v9__
-+  __asm volatile ("membar #StoreStore" : : : "memory");
-+#else
-+  __sync_synchronize ();
-+#endif
- }
---- libgomp/config/linux/ia64/futex.h.jj	2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/ia64/futex.h	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -29,23 +29,24 @@
- 
- #include <sys/syscall.h>
- 
--#define FUTEX_WAIT	0
--#define FUTEX_WAKE	1
- 
- 
--static inline void
--sys_futex0(int *addr, int op, int val)
-+static inline long
-+sys_futex0(int *addr, long op, int val)
- {
-   register long out0 asm ("out0") = (long) addr;
-   register long out1 asm ("out1") = op;
-   register long out2 asm ("out2") = val;
-   register long out3 asm ("out3") = 0;
-+  register long r8 asm ("r8");
-+  register long r10 asm ("r10");
-   register long r15 asm ("r15") = SYS_futex;
- 
-   __asm __volatile ("break 0x100000"
--	: "=r"(r15), "=r"(out0), "=r"(out1), "=r"(out2), "=r"(out3)
-+	: "=r"(r15), "=r"(out0), "=r"(out1), "=r"(out2), "=r"(out3),
-+	  "=r"(r8), "=r"(r10)
- 	: "r"(r15), "r"(out0), "r"(out1), "r"(out2), "r"(out3)
--        : "memory", "r8", "r10", "out4", "out5", "out6", "out7",
-+	: "memory", "out4", "out5", "out6", "out7",
- 	  /* Non-stacked integer registers, minus r8, r10, r15.  */
- 	  "r2", "r3", "r9", "r11", "r12", "r13", "r14", "r16", "r17", "r18",
- 	  "r19", "r20", "r21", "r22", "r23", "r24", "r25", "r26", "r27",
-@@ -56,16 +57,41 @@ sys_futex0(int *addr, int op, int val)
- 	  "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",
- 	  /* Branch registers.  */
- 	  "b6");
-+  return r8 & r10;
- }
- 
- static inline void
- futex_wait (int *addr, int val)
- {
--  sys_futex0 (addr, FUTEX_WAIT, val);
-+  long err = sys_futex0 (addr, gomp_futex_wait, val);
-+  if (__builtin_expect (err == ENOSYS, 0))
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      sys_futex0 (addr, gomp_futex_wait, val);
-+    }
- }
- 
- static inline void
- futex_wake (int *addr, int count)
- {
--  sys_futex0 (addr, FUTEX_WAKE, count);
-+  long err = sys_futex0 (addr, gomp_futex_wake, count);
-+  if (__builtin_expect (err == ENOSYS, 0))
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      sys_futex0 (addr, gomp_futex_wake, count);
-+    }
-+}
-+
-+static inline void
-+cpu_relax (void)
-+{
-+  __asm volatile ("hint @pause" : : : "memory");
-+}
-+
-+static inline void
-+atomic_write_barrier (void)
-+{
-+  __sync_synchronize ();
- }
---- libgomp/config/linux/s390/futex.h.jj	2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/s390/futex.h	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Jakub Jelinek <jakub@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -28,10 +28,8 @@
- /* Provide target-specific access to the futex system call.  */
- 
- #include <sys/syscall.h>
--#define FUTEX_WAIT	0
--#define FUTEX_WAKE	1
- 
--static inline void
-+static inline long
- sys_futex0 (int *addr, int op, int val)
- {
-   register long int gpr2  __asm__ ("2");
-@@ -49,16 +47,41 @@ sys_futex0 (int *addr, int op, int val)
- 		  : "i" (SYS_futex),
- 		    "0" (gpr2), "d" (gpr3), "d" (gpr4), "d" (gpr5)
- 		  : "memory");
-+  return gpr2;
- }
- 
- static inline void
- futex_wait (int *addr, int val)
- {
--  sys_futex0 (addr, FUTEX_WAIT, val);
-+  long err = sys_futex0 (addr, gomp_futex_wait, val);
-+  if (__builtin_expect (err == -ENOSYS, 0))
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      sys_futex0 (addr, gomp_futex_wait, val);
-+    }
- }
- 
- static inline void
- futex_wake (int *addr, int count)
- {
--  sys_futex0 (addr, FUTEX_WAKE, count);
-+  long err = sys_futex0 (addr, gomp_futex_wake, count);
-+  if (__builtin_expect (err == -ENOSYS, 0))
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      sys_futex0 (addr, gomp_futex_wake, count);
-+    }
-+}
-+
-+static inline void
-+cpu_relax (void)
-+{
-+  __asm volatile ("" : : : "memory");
-+}
-+
-+static inline void
-+atomic_write_barrier (void)
-+{
-+  __sync_synchronize ();
- }
---- libgomp/config/linux/mutex.c.jj	2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/mutex.c	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -29,9 +29,10 @@
-    mechanism for libgomp.  This type is private to the library.  This
-    implementation uses atomic instructions and the futex syscall.  */
- 
--#include "libgomp.h"
--#include "futex.h"
-+#include "wait.h"
- 
-+long int gomp_futex_wake = FUTEX_WAKE | FUTEX_PRIVATE_FLAG;
-+long int gomp_futex_wait = FUTEX_WAIT | FUTEX_PRIVATE_FLAG;
- 
- void
- gomp_mutex_lock_slow (gomp_mutex_t *mutex)
-@@ -40,7 +41,7 @@ gomp_mutex_lock_slow (gomp_mutex_t *mute
-     {
-       int oldval = __sync_val_compare_and_swap (mutex, 1, 2);
-       if (oldval != 0)
--        futex_wait (mutex, 2);
-+	do_wait (mutex, 2);
-     }
-   while (!__sync_bool_compare_and_swap (mutex, 0, 2));
- }
---- libgomp/config/linux/sem.c.jj	2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/sem.c	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -29,8 +29,7 @@
-    mechanism for libgomp.  This type is private to the library.  This 
-    implementation uses atomic instructions and the futex syscall.  */
- 
--#include "libgomp.h"
--#include "futex.h"
-+#include "wait.h"
- 
- 
- void
-@@ -44,7 +43,7 @@ gomp_sem_wait_slow (gomp_sem_t *sem)
- 	  if (__sync_bool_compare_and_swap (sem, val, val - 1))
- 	    return;
- 	}
--      futex_wait (sem, -1);
-+      do_wait (sem, -1);
-     }
- }
- 
---- libgomp/config/linux/powerpc/futex.h.jj	2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/powerpc/futex.h	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -28,10 +28,8 @@
- /* Provide target-specific access to the futex system call.  */
- 
- #include <sys/syscall.h>
--#define FUTEX_WAIT	0
--#define FUTEX_WAKE	1
- 
--static inline void
-+static inline long
- sys_futex0 (int *addr, int op, int val)
- {
-   register long int r0  __asm__ ("r0");
-@@ -50,21 +48,48 @@ sys_futex0 (int *addr, int op, int val)
-      doesn't.  It doesn't much matter for us.  In the interest of unity,
-      go ahead and clobber it always.  */
- 
--  __asm volatile ("sc"
-+  __asm volatile ("sc; mfcr %0"
- 		  : "=r"(r0), "=r"(r3), "=r"(r4), "=r"(r5), "=r"(r6)
- 		  : "r"(r0), "r"(r3), "r"(r4), "r"(r5), "r"(r6)
- 		  : "r7", "r8", "r9", "r10", "r11", "r12",
- 		    "cr0", "ctr", "memory");
-+  if (__builtin_expect (r0 & (1 << 28), 0))
-+    return r3;
-+  return 0;
- }
- 
- static inline void
- futex_wait (int *addr, int val)
- {
--  sys_futex0 (addr, FUTEX_WAIT, val);
-+  long err = sys_futex0 (addr, gomp_futex_wait, val);
-+  if (__builtin_expect (err == ENOSYS, 0))
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      sys_futex0 (addr, gomp_futex_wait, val);
-+    }
- }
- 
- static inline void
- futex_wake (int *addr, int count)
- {
--  sys_futex0 (addr, FUTEX_WAKE, count);
-+  long err = sys_futex0 (addr, gomp_futex_wake, count);
-+  if (__builtin_expect (err == ENOSYS, 0))
-+    {
-+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
-+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
-+      sys_futex0 (addr, gomp_futex_wake, count);
-+    }
-+}
-+
-+static inline void
-+cpu_relax (void)
-+{
-+  __asm volatile ("" : : : "memory");
-+}
-+
-+static inline void
-+atomic_write_barrier (void)
-+{
-+  __asm volatile ("eieio" : : : "memory");
- }
---- libgomp/config/linux/bar.c.jj	2007-12-07 14:41:00.000000000 +0100
-+++ libgomp/config/linux/bar.c	2008-03-26 15:11:32.000000000 +0100
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -29,32 +29,29 @@
-    mechanism for libgomp.  This type is private to the library.  This 
-    implementation uses atomic instructions and the futex syscall.  */
- 
--#include "libgomp.h"
--#include "futex.h"
- #include <limits.h>
-+#include "wait.h"
- 
- 
- void
--gomp_barrier_wait_end (gomp_barrier_t *bar, bool last)
-+gomp_barrier_wait_end (gomp_barrier_t *bar, gomp_barrier_state_t state)
- {
--  if (last)
-+  if (__builtin_expect ((state & 1) != 0, 0))
-     {
--      bar->generation++;
--      futex_wake (&bar->generation, INT_MAX);
-+      /* Next time we'll be awaiting TOTAL threads again.  */
-+      bar->awaited = bar->total;
-+      atomic_write_barrier ();
-+      bar->generation += 2;
-+      futex_wake ((int *) &bar->generation, INT_MAX);
-     }
-   else
-     {
--      unsigned int generation = bar->generation;
--
--      gomp_mutex_unlock (&bar->mutex);
-+      unsigned int generation = state;
- 
-       do
--	futex_wait (&bar->generation, generation);
-+	do_wait ((int *) &bar->generation, generation);
-       while (bar->generation == generation);
-     }
--
--  if (__sync_add_and_fetch (&bar->arrived, -1) == 0)
--    gomp_mutex_unlock (&bar->mutex);
- }
- 
- void
-@@ -62,3 +59,18 @@ gomp_barrier_wait (gomp_barrier_t *barri
- {
-   gomp_barrier_wait_end (barrier, gomp_barrier_wait_start (barrier));
- }
-+
-+/* Like gomp_barrier_wait, except that if the encountering thread
-+   is not the last one to hit the barrier, it returns immediately.
-+   The intended usage is that a thread which intends to gomp_barrier_destroy
-+   this barrier calls gomp_barrier_wait, while all other threads
-+   call gomp_barrier_wait_last.  When gomp_barrier_wait returns,
-+   the barrier can be safely destroyed.  */
-+
-+void
-+gomp_barrier_wait_last (gomp_barrier_t *barrier)
-+{
-+  gomp_barrier_state_t state = gomp_barrier_wait_start (barrier);
-+  if (state & 1)
-+    gomp_barrier_wait_end (barrier, state);
-+}
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-ppc32-retaddr.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-ppc32-retaddr.patch
deleted file mode 100644
index e9ae1bc..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-ppc32-retaddr.patch
+++ /dev/null
@@ -1,86 +0,0 @@ 
-2005-11-28  Jakub Jelinek  <jakub@redhat.com>
-
-	* config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0,
-	read word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx
-	instead of doing an extran indirection from frame_pointer_rtx.
-
-	* gcc.dg/20051128-1.c: New test.
-
---- gcc/config/rs6000/rs6000.c.jj	2005-11-26 14:38:01.000000000 +0100
-+++ gcc/config/rs6000/rs6000.c	2005-11-28 20:32:18.000000000 +0100
-@@ -13166,17 +13166,22 @@ rs6000_return_addr (int count, rtx frame
-      don't try to be too clever here.  */
-   if (count != 0 || (DEFAULT_ABI != ABI_AIX && flag_pic))
-     {
-+      rtx x;
-       cfun->machine->ra_needs_full_frame = 1;
- 
--      return
--	gen_rtx_MEM
--	  (Pmode,
--	   memory_address
--	   (Pmode,
--	    plus_constant (copy_to_reg
--			   (gen_rtx_MEM (Pmode,
--					 memory_address (Pmode, frame))),
--			   RETURN_ADDRESS_OFFSET)));
-+      if (count == 0)
-+	{
-+	  gcc_assert (frame == frame_pointer_rtx);
-+	  x = arg_pointer_rtx;
-+	}
-+      else
-+	{
-+	  x = memory_address (Pmode, frame);
-+	  x = copy_to_reg (gen_rtx_MEM (Pmode, x));
-+	}
-+
-+      x = plus_constant (x, RETURN_ADDRESS_OFFSET);
-+      return gen_rtx_MEM (Pmode, memory_address (Pmode, x));
-     }
- 
-   cfun->machine->ra_need_lr = 1;
---- gcc/testsuite/gcc.dg/20051128-1.c.jj	2005-10-10 11:21:41.096999000 +0200
-+++ gcc/testsuite/gcc.dg/20051128-1.c	2005-11-28 12:30:57.000000000 +0100
-@@ -0,0 +1,41 @@
-+/* { dg-do run } */
-+/* { dg-options "-O2 -fpic" } */
-+
-+extern void exit (int);
-+extern void abort (void);
-+
-+int b;
-+
-+struct A
-+{
-+  void *pad[147];
-+  void *ra, *h;
-+  long o;
-+};
-+
-+void
-+__attribute__((noinline))
-+foo (struct A *a, void *x)
-+{
-+  __builtin_memset (a, 0, sizeof (a));
-+  if (!b)
-+    exit (0);
-+}
-+
-+void
-+__attribute__((noinline))
-+bar (void)
-+{
-+  struct A a;
-+
-+  __builtin_unwind_init ();
-+  foo (&a, __builtin_return_address (0));
-+}
-+
-+int
-+main (void)
-+{
-+  bar ();
-+  abort ();
-+  return 0;
-+}
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr27898.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr27898.patch
deleted file mode 100644
index 172bb81..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr27898.patch
+++ /dev/null
@@ -1,16 +0,0 @@ 
-2006-08-18  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/27898
-	* gcc.dg/pr27898.c: New test.
-
---- gcc/testsuite/gcc.dg/pr27898.c.jj	2006-08-18 09:19:33.000000000 +0200
-+++ gcc/testsuite/gcc.dg/pr27898.c	2006-08-18 09:19:27.000000000 +0200
-@@ -0,0 +1,8 @@
-+/* PR c/27898 */
-+/* { dg-do compile } */
-+/* { dg-options "--combine" } */
-+/* { dg-additional-sources "pr27898.c" } */
-+
-+union u { struct { int i; }; };
-+
-+extern int foo (union u *);
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr32139.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr32139.patch
deleted file mode 100644
index f356967..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr32139.patch
+++ /dev/null
@@ -1,19 +0,0 @@ 
-2007-06-01  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/32139
-	* gcc.c-torture/compile/20070531-1.c: New test.
-
---- gcc/testsuite/gcc.c-torture/compile/20070531-1.c.jj	2007-05-31 13:47:22.000000000 +0200
-+++ gcc/testsuite/gcc.c-torture/compile/20070531-1.c	2007-06-01 10:57:15.000000000 +0200
-@@ -0,0 +1,11 @@
-+/* PR tree-optimization/32139 */
-+int foo (void);
-+int bar (void) __attribute__ ((const));
-+
-+int
-+test (int x)
-+{
-+  int a = (x == 10000 ? foo : bar) ();
-+  int b = (x == 10000 ? foo : bar) ();
-+  return a + b;
-+}
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr33763.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr33763.patch
deleted file mode 100644
index 9e9c90d..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr33763.patch
+++ /dev/null
@@ -1,153 +0,0 @@ 
-2007-11-06  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/33763
-	* gcc.dg/pr33763.c: New test.
-	* g++.dg/opt/inline13.C: New test.
-
-2007-11-06  Jan Hubicka  <jh@suse.cz>
-
-	PR tree-optimization/33763
-	* tree-inline.c (expand_call_inline): Silently ignore always_inline
-	attribute for redefined extern inline functions.
-
---- gcc/tree-inline.c.jj	2007-11-06 09:29:04.000000000 +0100
-+++ gcc/tree-inline.c	2007-11-06 16:19:12.000000000 +0100
-@@ -2582,6 +2582,12 @@ expand_call_inline (basic_block bb, tree
-   if (!cgraph_inline_p (cg_edge, &reason))
-     {
-       if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn))
-+	/* For extern inline functions that get redefined we always
-+	   silently ignored alway_inline flag. Better behaviour would
-+	   be to be able to keep both bodies and use extern inline body
-+	   for inlining, but we can't do that because frontends overwrite
-+	   the body.  */
-+	  && !cg_edge->callee->local.redefined_extern_inline
- 	  /* Avoid warnings during early inline pass. */
- 	  && (!flag_unit_at_a_time || cgraph_global_info_ready))
- 	{
---- gcc/testsuite/gcc.dg/pr33763.c.jj	2007-11-06 16:19:12.000000000 +0100
-+++ gcc/testsuite/gcc.dg/pr33763.c	2007-11-06 16:19:12.000000000 +0100
-@@ -0,0 +1,60 @@
-+/* PR tree-optimization/33763 */
-+/* { dg-do compile } */
-+/* { dg-options "-O2" } */
-+
-+typedef struct
-+{
-+  void *a;
-+  void *b;
-+} T;
-+extern void *foo (const char *, const char *);
-+extern void *bar (void *, const char *, T);
-+extern int baz (const char *, int);
-+
-+extern inline __attribute__ ((always_inline, gnu_inline)) int
-+baz (const char *x, int y)
-+{
-+  return 2;
-+}
-+
-+int
-+baz (const char *x, int y)
-+{
-+  return 1;
-+}
-+
-+int xa, xb;
-+
-+static void *
-+inl (const char *x, const char *y)
-+{
-+  T t = { &xa, &xb };
-+  int *f = (int *) __builtin_malloc (sizeof (int));
-+  const char *z;
-+  int o = 0;
-+  void *r = 0;
-+
-+  for (z = y; *z; z++)
-+    {
-+      if (*z == 'r')
-+	o |= 1;
-+      if (*z == 'w')
-+	o |= 2;
-+    }
-+  if (o == 1)
-+    *f = baz (x, 0);
-+  if (o == 2)
-+    *f = baz (x, 1);
-+  if (o == 3)
-+    *f = baz (x, 2);
-+
-+  if (o && *f > 0)
-+    r = bar (f, "w", t);
-+  return r;
-+}
-+
-+void *
-+foo (const char *x, const char *y)
-+{
-+  return inl (x, y);
-+}
---- gcc/testsuite/g++.dg/opt/inline13.C.jj	2007-11-06 16:20:20.000000000 +0100
-+++ gcc/testsuite/g++.dg/opt/inline13.C	2007-11-06 16:21:30.000000000 +0100
-@@ -0,0 +1,60 @@
-+// PR tree-optimization/33763
-+// { dg-do compile }
-+// { dg-options "-O2" }
-+
-+typedef struct
-+{
-+  void *a;
-+  void *b;
-+} T;
-+extern void *foo (const char *, const char *);
-+extern void *bar (void *, const char *, T);
-+extern int baz (const char *, int);
-+
-+extern inline __attribute__ ((always_inline, gnu_inline)) int
-+baz (const char *x, int y)
-+{
-+  return 2;
-+}
-+
-+int
-+baz (const char *x, int y)
-+{
-+  return 1;
-+}
-+
-+int xa, xb;
-+
-+static void *
-+inl (const char *x, const char *y)
-+{
-+  T t = { &xa, &xb };
-+  int *f = (int *) __builtin_malloc (sizeof (int));
-+  const char *z;
-+  int o = 0;
-+  void *r = 0;
-+
-+  for (z = y; *z; z++)
-+    {
-+      if (*z == 'r')
-+	o |= 1;
-+      if (*z == 'w')
-+	o |= 2;
-+    }
-+  if (o == 1)
-+    *f = baz (x, 0);
-+  if (o == 2)
-+    *f = baz (x, 1);
-+  if (o == 3)
-+    *f = baz (x, 2);
-+
-+  if (o && *f > 0)
-+    r = bar (f, "w", t);
-+  return r;
-+}
-+
-+void *
-+foo (const char *x, const char *y)
-+{
-+  return inl (x, y);
-+}
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr35440.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr35440.patch
deleted file mode 100644
index 6bf3f0d..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr35440.patch
+++ /dev/null
@@ -1,56 +0,0 @@ 
-2008-03-19  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/35440
-	* c-pretty-print.c (pp_c_initializer_list): Handle CONSTRUCTOR
-	for all types.
-
-	* gcc.dg/pr35440.c: New test.
-
---- gcc/c-pretty-print.c.jj	2008-02-11 14:48:12.000000000 +0100
-+++ gcc/c-pretty-print.c	2008-03-19 14:50:09.000000000 +0100
-@@ -1173,6 +1173,12 @@ pp_c_initializer_list (c_pretty_printer 
-   tree type = TREE_TYPE (e);
-   const enum tree_code code = TREE_CODE (type);
- 
-+  if (TREE_CODE (e) == CONSTRUCTOR)
-+    {
-+      pp_c_constructor_elts (pp, CONSTRUCTOR_ELTS (e));
-+      return;
-+    }
-+
-   switch (code)
-     {
-     case RECORD_TYPE:
-@@ -1207,16 +1213,12 @@ pp_c_initializer_list (c_pretty_printer 
-     case VECTOR_TYPE:
-       if (TREE_CODE (e) == VECTOR_CST)
- 	pp_c_expression_list (pp, TREE_VECTOR_CST_ELTS (e));
--      else if (TREE_CODE (e) == CONSTRUCTOR)
--	pp_c_constructor_elts (pp, CONSTRUCTOR_ELTS (e));
-       else
- 	break;
-       return;
- 
-     case COMPLEX_TYPE:
--      if (TREE_CODE (e) == CONSTRUCTOR)
--	pp_c_constructor_elts (pp, CONSTRUCTOR_ELTS (e));
--      else if (TREE_CODE (e) == COMPLEX_CST || TREE_CODE (e) == COMPLEX_EXPR)
-+      if (TREE_CODE (e) == COMPLEX_CST || TREE_CODE (e) == COMPLEX_EXPR)
- 	{
- 	  const bool cst = TREE_CODE (e) == COMPLEX_CST;
- 	  pp_expression (pp, cst ? TREE_REALPART (e) : TREE_OPERAND (e, 0));
---- gcc/testsuite/gcc.dg/pr35440.c.jj	2008-03-19 15:57:13.000000000 +0100
-+++ gcc/testsuite/gcc.dg/pr35440.c	2008-03-19 15:47:35.000000000 +0100
-@@ -0,0 +1,12 @@
-+/* PR c/35440 */
-+/* { dg-do compile } */
-+/* { dg-options "-std=gnu99" } */
-+
-+struct A {};
-+struct B { int i; char j[2]; };
-+
-+void foo (void)
-+{
-+  (struct A){}();			/* { dg-error "called object" } */
-+  (struct B){ .i = 2, .j[1] = 1 }();	/* { dg-error "called object" } */
-+}
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr35751.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr35751.patch
deleted file mode 100644
index 37b8427..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr35751.patch
+++ /dev/null
@@ -1,114 +0,0 @@ 
-2008-04-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/35751
-	* c-decl.c (finish_decl): If extern or static var has variable
-	size, set TREE_TYPE (decl) to error_mark_node.
-
-	* decl.c (layout_var_decl): If extern or static var has variable
-	size, set TREE_TYPE (decl) to error_mark_node.
-
-	* gcc.dg/gomp/pr35751.c: New test.
-	* g++.dg/gomp/pr35751.C: New test.
-
---- gcc/c-decl.c.jj	2008-04-03 09:41:42.000000000 +0200
-+++ gcc/c-decl.c	2008-04-03 18:20:52.000000000 +0200
-@@ -3481,7 +3481,10 @@ finish_decl (tree decl, tree init, tree 
- 	  if (TREE_CODE (DECL_SIZE (decl)) == INTEGER_CST)
- 	    constant_expression_warning (DECL_SIZE (decl));
- 	  else
--	    error ("storage size of %q+D isn%'t constant", decl);
-+	    {
-+	      error ("storage size of %q+D isn%'t constant", decl);
-+	      TREE_TYPE (decl) = error_mark_node;
-+	    }
- 	}
- 
-       if (TREE_USED (type))
---- gcc/cp/decl.c.jj	2008-03-31 23:54:40.000000000 +0200
-+++ gcc/cp/decl.c	2008-04-03 18:30:19.000000000 +0200
-@@ -4442,7 +4442,10 @@ layout_var_decl (tree decl)
-       if (TREE_CODE (DECL_SIZE (decl)) == INTEGER_CST)
- 	constant_expression_warning (DECL_SIZE (decl));
-       else
--	error ("storage size of %qD isn't constant", decl);
-+	{
-+	  error ("storage size of %qD isn't constant", decl);
-+	  TREE_TYPE (decl) = error_mark_node;
-+	}
-     }
- }
- 
---- gcc/testsuite/gcc.dg/gomp/pr35751.c.jj	2008-04-03 18:26:12.000000000 +0200
-+++ gcc/testsuite/gcc.dg/gomp/pr35751.c	2008-04-03 18:25:51.000000000 +0200
-@@ -0,0 +1,34 @@
-+/* PR c/35751 */
-+/* { dg-do compile } */
-+/* { dg-options "-fopenmp" } */
-+
-+void
-+foo (int i)
-+{
-+  extern int a[i];	/* { dg-error "must have no linkage|storage size of" } */
-+  static int b[i];	/* { dg-error "storage size of" } */
-+
-+#pragma omp parallel
-+  {
-+    a[0] = 0;
-+    b[0] = 0;
-+  }
-+
-+#pragma omp parallel shared (a, b)
-+  {
-+    a[0] = 0;
-+    b[0] = 0;
-+  }
-+
-+#pragma omp parallel private (a, b)
-+  {
-+    a[0] = 0;
-+    b[0] = 0;
-+  }
-+
-+#pragma omp parallel firstprivate (a, b)
-+  {
-+    a[0] = 0;
-+    b[0] = 0;
-+  }
-+}
---- gcc/testsuite/g++.dg/gomp/pr35751.C.jj	2008-04-03 18:32:13.000000000 +0200
-+++ gcc/testsuite/g++.dg/gomp/pr35751.C	2008-04-03 18:32:32.000000000 +0200
-@@ -0,0 +1,34 @@
-+// PR c/35751
-+// { dg-do compile }
-+// { dg-options "-fopenmp" }
-+
-+void
-+foo (int i)
-+{
-+  extern int a[i];	// { dg-error "storage size of" }
-+  static int b[i];	// { dg-error "storage size of" }
-+
-+#pragma omp parallel
-+  {
-+    a[0] = 0;
-+    b[0] = 0;
-+  }
-+
-+#pragma omp parallel shared (a, b)
-+  {
-+    a[0] = 0;
-+    b[0] = 0;
-+  }
-+
-+#pragma omp parallel private (a, b)
-+  {
-+    a[0] = 0;
-+    b[0] = 0;
-+  }
-+
-+#pragma omp parallel firstprivate (a, b)
-+  {
-+    a[0] = 0;
-+    b[0] = 0;
-+  }
-+}
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh251682.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh251682.patch
deleted file mode 100644
index e96ae6f..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh251682.patch
+++ /dev/null
@@ -1,89 +0,0 @@ 
-2008-04-01  Jakub Jelinek  <jakub@redhat.com>
-
-	PR pch/13675
-	* files.c (struct _cpp_file): Remove pch field.
-	(pch_open_file): Don't set file->pch, just file->pchname.
-	(should_stack_file): After pfile->cb.read_pch call
-	free pchname and clear pchname, don't close file->fd.
-	Test file->pchname instead of file->pch.  Don't close fd after cb.
-	(_cpp_stack_include): Test file->pchname instead of file->pch.
-
-	* c-pch.c (c_common_read_pch): On error close (fd) resp. fclose (f).
-
---- libcpp/files.c.jj	2008-02-18 23:50:17.000000000 +0100
-+++ libcpp/files.c	2008-03-31 15:59:01.000000000 +0200
-@@ -106,9 +106,6 @@ struct _cpp_file
- 
-   /* If BUFFER above contains the true contents of the file.  */
-   bool buffer_valid;
--
--  /* File is a PCH (on return from find_include_file).  */
--  bool pch;
- };
- 
- /* A singly-linked list for all searches for a given file name, with
-@@ -322,9 +319,7 @@ pch_open_file (cpp_reader *pfile, _cpp_f
- 	    }
- 	  closedir (pchdir);
- 	}
--      if (valid)
--	file->pch = true;
--      else
-+      if (!valid)
- 	*invalid_pch = true;
-     }
- 
-@@ -703,11 +698,12 @@ should_stack_file (cpp_reader *pfile, _c
-     return false;
- 
-   /* Handle PCH files immediately; don't stack them.  */
--  if (file->pch)
-+  if (file->pchname)
-     {
-       pfile->cb.read_pch (pfile, file->pchname, file->fd, file->path);
--      close (file->fd);
-       file->fd = -1;
-+      free ((void *) file->pchname);
-+      file->pchname = NULL;
-       return false;
-     }
- 
-@@ -916,7 +912,7 @@ _cpp_stack_include (cpp_reader *pfile, c
-      complicates LAST_SOURCE_LINE_LOCATION.  This does not apply if we
-      found a PCH file (in which case linemap_add is not called) or we
-      were included from the command-line.  */
--  if (! file->pch && file->err_no == 0 && type != IT_CMDLINE)
-+  if (file->pchname == NULL && file->err_no == 0 && type != IT_CMDLINE)
-     pfile->line_table->highest_location--;
- 
-   return _cpp_stack_file (pfile, file, type == IT_IMPORT);
---- gcc/c-pch.c.jj	2008-02-18 23:46:08.000000000 +0100
-+++ gcc/c-pch.c	2008-03-31 15:56:00.000000000 +0200
-@@ -372,6 +372,7 @@ c_common_read_pch (cpp_reader *pfile, co
-   if (f == NULL)
-     {
-       cpp_errno (pfile, CPP_DL_ERROR, "calling fdopen");
-+      close (fd);
-       return;
-     }
- 
-@@ -380,6 +381,7 @@ c_common_read_pch (cpp_reader *pfile, co
-   if (fread (&h, sizeof (h), 1, f) != 1)
-     {
-       cpp_errno (pfile, CPP_DL_ERROR, "reading");
-+      fclose (f);
-       return;
-     }
- 
-@@ -425,7 +427,10 @@ c_common_read_pch (cpp_reader *pfile, co
-   gt_pch_restore (f);
- 
-   if (cpp_read_state (pfile, name, f, smd) != 0)
--    return;
-+    {
-+      fclose (f);
-+      return;
-+    }
- 
-   fclose (f);
- 
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh330771.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh330771.patch
deleted file mode 100644
index c894f83..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh330771.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-2007-10-16  Jakub Jelinek  <jakub@redhat.com>
-
-	* Makefile.am (libgcj_tools_la_LIBADD): Add.
-	* Makefile.in: Regenerated.
-
---- libjava/Makefile.am.jj	2007-03-17 09:20:30.000000000 +0100
-+++ libjava/Makefile.am	2007-10-16 15:45:14.000000000 +0200
-@@ -262,6 +262,8 @@ EXTRA_libgcj_la_SOURCES = java/lang/Obje
- 
- libgcj_tools_la_SOURCES = classpath/tools/tools.zip
- libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes  -fsource-filename=$(here)/classpath/tools/all-classes.lst
-+## See jv_convert_LDADD.
-+libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la
- libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
-  -version-info `grep -v '^\#' $(srcdir)/libtool-version`
- libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
---- libjava/Makefile.in.jj	2007-07-04 21:11:11.000000000 +0200
-+++ libjava/Makefile.in	2007-10-16 15:56:07.000000000 +0200
-@@ -146,7 +146,6 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt
- am_lib_gnu_awt_xlib_la_OBJECTS = $(am__objects_1)
- lib_gnu_awt_xlib_la_OBJECTS = $(am_lib_gnu_awt_xlib_la_OBJECTS)
- @XLIB_AWT_TRUE@am_lib_gnu_awt_xlib_la_rpath = -rpath $(toolexeclibdir)
--libgcj_tools_la_LIBADD =
- am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo
- libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS)
- am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
-@@ -894,6 +893,7 @@ libgcj_la_LINK = $(LIBLINK)
- EXTRA_libgcj_la_SOURCES = java/lang/Object.java
- libgcj_tools_la_SOURCES = classpath/tools/tools.zip
- libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes  -fsource-filename=$(here)/classpath/tools/all-classes.lst
-+libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la
- libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
-  -version-info `grep -v '^\#' $(srcdir)/libtool-version`
- 
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh341221.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh341221.patch
deleted file mode 100644
index 28e73b0..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh341221.patch
+++ /dev/null
@@ -1,28 +0,0 @@ 
-2007-10-21  Jakub Jelinek  <jakub@redhat.com>
-
-	* doc/Makefile.am (POD2MAN): Set date from cp-tools.texinfo
-	timestamp rather than from current date.
-	* doc/Makefile.in: Regenerated.
-
---- libjava/classpath/doc/Makefile.am.jj	2007-12-07 17:55:00.000000000 +0100
-+++ libjava/classpath/doc/Makefile.am	2007-12-07 18:55:28.000000000 +0100
-@@ -30,7 +30,7 @@ TOOLS_MANFILES = \
- 	gserialver.1 \
- 	gtnameserv.1
- 
--POD2MAN = pod2man --center="GNU" --release="$(VERSION)"
-+POD2MAN = pod2man --center="GNU" --release="$(VERSION)" --date="$(shell ls --time-style=+%F -l $(srcdir)/cp-tools.texinfo | awk '{print $$6}')"
- TEXI2POD = perl $(srcdir)/texi2pod.pl
- STAMP = echo timestamp >
- 
---- libjava/classpath/doc/Makefile.in.jj	2007-12-07 17:55:00.000000000 +0100
-+++ libjava/classpath/doc/Makefile.in	2007-12-07 18:55:43.000000000 +0100
-@@ -357,7 +357,7 @@ TOOLS_MANFILES = \
- 	gserialver.1 \
- 	gtnameserv.1
- 
--POD2MAN = pod2man --center="GNU" --release="$(VERSION)"
-+POD2MAN = pod2man --center="GNU" --release="$(VERSION)" --date="$(shell ls --time-style=+%F -l $(srcdir)/cp-tools.texinfo | awk '{print $$6}')"
- TEXI2POD = perl $(srcdir)/texi2pod.pl
- STAMP = echo timestamp >
- @GENINSRC_FALSE@STAMP_GENINSRC = 
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fortran-cross-compile-hack.patch
deleted file mode 100644
index b3d38ad..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fortran-cross-compile-hack.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
-* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used
-  used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross
-  directory.
-
-diff --git a/libgfortran/configure b/libgfortran/configure
-index f7d86fb..d0966ec 100755
---- a/libgfortran/configure
-+++ b/libgfortran/configure
-@@ -4475,6 +4475,6 @@ exec 5>>./config.log
- 
- # We need gfortran to compile parts of the library
- #AC_PROG_FC(gfortran)
--FC="$GFORTRAN"
-+#FC="$GFORTRAN"
- ac_ext=${FC_SRCEXT-f}
- ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
-\ No newline at end of file
-diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
-index 4661306..9f83e55 100644
---- a/libgfortran/configure.ac
-+++ b/libgfortran/configure.ac
-@@ -140,7 +140,7 @@ AC_SUBST(enable_static)
- 
- # We need gfortran to compile parts of the library
- #AC_PROG_FC(gfortran)
--FC="$GFORTRAN"
-+#FC="$GFORTRAN"
- AC_PROG_FC(gfortran)
- 
- # extra LD Flags which are required for targets
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/fortran-static-linking.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fortran-static-linking.patch
deleted file mode 100644
index 3dd6321..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/fortran-static-linking.patch
+++ /dev/null
@@ -1,48 +0,0 @@ 
-f951 (fortran) links to MPFR and GMP of our staging area but when executing
-the command the libs can not be found. Use rpath like all the other apps in
-our staging bin/ directory.
-
-Patch the configure to avoid the regeneration...
-
-Index: gcc-4.2.2/configure
-===================================================================
---- gcc-4.2.2.orig/configure	2008-01-15 23:23:41.000000000 +0100
-+++ gcc-4.2.2/configure	2008-01-15 23:25:20.000000000 +0100
-@@ -2278,14 +2278,14 @@
- 
- 
- if test "x$with_mpfr" != x; then
--  gmplibs="-L$with_mpfr/lib $gmplibs"
-+  gmplibs="-static -L$with_mpfr/lib $gmplibs"
-   gmpinc="-I$with_mpfr/include"
- fi
- if test "x$with_mpfr_include" != x; then
-   gmpinc="-I$with_mpfr_include"
- fi
- if test "x$with_mpfr_lib" != x; then
--  gmplibs="-L$with_mpfr_lib $gmplibs"
-+  gmplibs="-static -L$with_mpfr_lib $gmplibs"
- fi
- 
- # Specify a location for gmp
-Index: gcc-4.2.2/configure.in
-===================================================================
---- gcc-4.2.2.orig/configure.in	2008-01-15 23:23:41.000000000 +0100
-+++ gcc-4.2.2/configure.in	2008-01-15 23:24:36.000000000 +0100
-@@ -1066,14 +1066,14 @@
- AC_ARG_WITH(mpfr_lib, [  --with-mpfr-lib=PATH    Specify the directory for the installed MPFR library])
- 
- if test "x$with_mpfr" != x; then
--  gmplibs="-L$with_mpfr/lib $gmplibs"
-+  gmplibs="-static -L$with_mpfr/lib $gmplibs"
-   gmpinc="-I$with_mpfr/include"
- fi
- if test "x$with_mpfr_include" != x; then
-   gmpinc="-I$with_mpfr_include"
- fi
- if test "x$with_mpfr_lib" != x; then
--  gmplibs="-L$with_mpfr_lib $gmplibs"
-+  gmplibs="-static -L$with_mpfr_lib $gmplibs"
- fi
- 
- # Specify a location for gmp
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch
deleted file mode 100644
index d1df8b2..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch
+++ /dev/null
@@ -1,319 +0,0 @@ 
-Adds support for Freescale Power architecture e300c2 and e300c3 cores.
-http://www.bitshrine.org/gpp/tc-fsl-x86lnx-e300c3-nptl-4.0.2-2.src.rpm
-
-Leon Woestenberg <leonw@mailcan.com>
-
----
- gcc/config.gcc                |    2 
- gcc/config/rs6000/e300c2c3.md |  189 ++++++++++++++++++++++++++++++++++++++++++
- gcc/config/rs6000/rs6000.c    |   24 +++++
- gcc/config/rs6000/rs6000.h    |    4 
- gcc/config/rs6000/rs6000.md   |    3 
- 5 files changed, 220 insertions(+), 2 deletions(-)
-
-Index: gcc-4.3.1/gcc/config/rs6000/e300c2c3.md
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.1/gcc/config/rs6000/e300c2c3.md	2008-08-23 16:51:33.000000000 -0700
-@@ -0,0 +1,189 @@
-+;; Pipeline description for Motorola PowerPC e300c3 core.
-+;;   Copyright (C) 2003 Free Software Foundation, Inc.
-+;;
-+;; This file is part of GCC.
-+
-+;; GCC is free software; you can redistribute it and/or modify it
-+;; under the terms of the GNU General Public License as published
-+;; by the Free Software Foundation; either version 2, or (at your
-+;; option) any later version.
-+
-+;; GCC is distributed in the hope that it will be useful, but WITHOUT
-+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-+;; License for more details.
-+
-+;; You should have received a copy of the GNU General Public License
-+;; along with GCC; see the file COPYING.  If not, write to the
-+;; Free Software Foundation, 59 Temple Place - Suite 330, Boston,
-+;; MA 02111-1307, USA.
-+
-+(define_automaton "ppce300c3_most,ppce300c3_long,ppce300c3_retire")
-+(define_cpu_unit "ppce300c3_decode_0,ppce300c3_decode_1" "ppce300c3_most")
-+
-+;; We don't simulate general issue queue (GIC).  If we have SU insn
-+;; and then SU1 insn, they can not be issued on the same cycle
-+;; (although SU1 insn and then SU insn can be issued) because the SU
-+;; insn will go to SU1 from GIC0 entry.  Fortunately, the first cycle
-+;; multipass insn scheduling will find the situation and issue the SU1
-+;; insn and then the SU insn.
-+(define_cpu_unit "ppce300c3_issue_0,ppce300c3_issue_1"   "ppce300c3_most")
-+
-+;; We could describe completion buffers slots in combination with the
-+;; retirement units and the order of completion but the result
-+;; automaton would behave in the same way because we can not describe
-+;; real latency time with taking in order completion into account.
-+;; Actually we could define the real latency time by querying reserved
-+;; automaton units but the current scheduler uses latency time before
-+;; issuing insns and making any reservations.
-+;;
-+;; So our description is aimed to achieve a insn schedule in which the
-+;; insns would not wait in the completion buffer.
-+(define_cpu_unit "ppce300c3_retire_0,ppce300c3_retire_1" "ppce300c3_retire")
-+
-+;; Branch unit:
-+(define_cpu_unit "ppce300c3_bu" "ppce300c3_most")
-+
-+;; IU:
-+(define_cpu_unit "ppce300c3_iu0_stage0,ppce300c3_iu1_stage0" "ppce300c3_most")
-+
-+;; IU: This used to describe non-pipelined division.
-+(define_cpu_unit "ppce300c3_mu_div" "ppce300c3_long")
-+
-+;; SRU:
-+(define_cpu_unit "ppce300c3_sru_stage0" "ppce300c3_most")
-+
-+;; Here we simplified LSU unit description not describing the stages.
-+(define_cpu_unit "ppce300c3_lsu" "ppce300c3_most")
-+
-+;; FPU:
-+(define_cpu_unit "ppce300c3_fpu" "ppce300c3_most")
-+
-+;; The following units are used to make automata deterministic
-+(define_cpu_unit "present_ppce300c3_decode_0" "ppce300c3_most")
-+(define_cpu_unit "present_ppce300c3_issue_0" "ppce300c3_most")
-+(define_cpu_unit "present_ppce300c3_retire_0" "ppce300c3_retire")
-+(define_cpu_unit "present_ppce300c3_iu0_stage0" "ppce300c3_most")
-+
-+;; The following sets to make automata deterministic when option ndfa is used.
-+(presence_set "present_ppce300c3_decode_0" "ppce300c3_decode_0")
-+(presence_set "present_ppce300c3_issue_0" "ppce300c3_issue_0")
-+(presence_set "present_ppce300c3_retire_0" "ppce300c3_retire_0")
-+(presence_set "present_ppce300c3_iu0_stage0" "ppce300c3_iu0_stage0")
-+
-+;; Some useful abbreviations.
-+(define_reservation "ppce300c3_decode"
-+    "ppce300c3_decode_0|ppce300c3_decode_1+present_ppce300c3_decode_0")
-+(define_reservation "ppce300c3_issue"
-+    "ppce300c3_issue_0|ppce300c3_issue_1+present_ppce300c3_issue_0")
-+(define_reservation "ppce300c3_retire"
-+   "ppce300c3_retire_0|ppce300c3_retire_1+present_ppce300c3_retire_0")
-+(define_reservation "ppce300c3_iu_stage0"
-+   "ppce300c3_iu0_stage0|ppce300c3_iu1_stage0+present_ppce300c3_iu0_stage0")
-+
-+;; Compares can be executed either one of the IU or SRU
-+(define_insn_reservation "ppce300c3_cmp" 1
-+  (and (eq_attr "type" "cmp,compare,delayed_compare,fast_compare")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+(ppce300c3_iu_stage0|ppce300c3_sru_stage0) \
-+        +ppce300c3_retire")
-+
-+;; Other one cycle IU insns
-+(define_insn_reservation "ppce300c3_iu" 1
-+  (and (eq_attr "type" "integer,insert_word")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_iu_stage0+ppce300c3_retire")
-+
-+;; Branch.  Actually this latency time is not used by the scheduler.
-+(define_insn_reservation "ppce300c3_branch" 1
-+  (and (eq_attr "type" "jmpreg,branch")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_bu,ppce300c3_retire")
-+
-+;; Multiply is non-pipelined but can be executed in any IU
-+(define_insn_reservation "ppce300c3_multiply" 2
-+  (and (eq_attr "type" "imul,imul2,imul3,imul_compare")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_iu_stage0, \
-+   ppce300c3_iu_stage0+ppce300c3_retire")
-+
-+;; Divide.  We use the average latency time here.  We omit reserving a
-+;; retire unit because of the result automata will be huge.
-+(define_insn_reservation "ppce300c3_divide" 20
-+  (and (eq_attr "type" "idiv")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_iu_stage0+ppce300c3_mu_div,\
-+   ppce300c3_mu_div*19")
-+
-+;; CR logical
-+(define_insn_reservation "ppce300c3_cr_logical" 1
-+  (and (eq_attr "type" "cr_logical,delayed_cr")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_sru_stage0+ppce300c3_retire")
-+
-+;; Mfcr
-+(define_insn_reservation "ppce300c3_mfcr" 1
-+  (and (eq_attr "type" "mfcr")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_sru_stage0+ppce300c3_retire")
-+
-+;; Mtcrf
-+(define_insn_reservation "ppce300c3_mtcrf" 1
-+  (and (eq_attr "type" "mtcr")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_sru_stage0+ppce300c3_retire")
-+
-+;; Mtjmpr
-+(define_insn_reservation "ppce300c3_mtjmpr" 1
-+  (and (eq_attr "type" "mtjmpr,mfjmpr")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_sru_stage0+ppce300c3_retire")
-+
-+;; Float point instructions
-+(define_insn_reservation "ppce300c3_fpcompare" 3
-+  (and (eq_attr "type" "fpcompare")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,nothing,ppce300c3_retire")
-+
-+(define_insn_reservation "ppce300c3_fp" 3
-+  (and (eq_attr "type" "fp")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,nothing,ppce300c3_retire")
-+
-+(define_insn_reservation "ppce300c3_dmul" 4
-+  (and (eq_attr "type" "dmul")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,ppce300c3_fpu,nothing,ppce300c3_retire")
-+
-+; Divides are not pipelined
-+(define_insn_reservation "ppce300c3_sdiv" 18
-+  (and (eq_attr "type" "sdiv")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,ppce300c3_fpu*17")
-+
-+(define_insn_reservation "ppce300c3_ddiv" 33
-+  (and (eq_attr "type" "ddiv")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,ppce300c3_fpu*32")
-+
-+;; Loads
-+(define_insn_reservation "ppce300c3_load" 2
-+  (and (eq_attr "type" "load,load_ext,load_ext_u,load_ext_ux,load_ux,load_u")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
-+
-+(define_insn_reservation "ppce300c3_fpload" 2
-+  (and (eq_attr "type" "fpload,fpload_ux,fpload_u")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
-+
-+;; Stores.
-+(define_insn_reservation "ppce300c3_store" 2
-+  (and (eq_attr "type" "store,store_ux,store_u")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
-+
-+(define_insn_reservation "ppce300c3_fpstore" 2
-+  (and (eq_attr "type" "fpstore,fpstore_ux,fpstore_u")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
-Index: gcc-4.3.1/gcc/config/rs6000/rs6000.c
-===================================================================
---- gcc-4.3.1.orig/gcc/config/rs6000/rs6000.c	2008-08-23 16:49:39.000000000 -0700
-+++ gcc-4.3.1/gcc/config/rs6000/rs6000.c	2008-08-23 16:54:25.000000000 -0700
-@@ -669,6 +669,21 @@ struct processor_costs ppc8540_cost = {
-   1,			/* prefetch streams /*/
- };
- 
-+/* Instruction costs on E300C2 and E300C3 cores.  */
-+static const
-+struct processor_costs ppce300c2c3_cost = {
-+  COSTS_N_INSNS (4),    /* mulsi */
-+  COSTS_N_INSNS (4),    /* mulsi_const */
-+  COSTS_N_INSNS (4),    /* mulsi_const9 */
-+  COSTS_N_INSNS (4),    /* muldi */
-+  COSTS_N_INSNS (19),   /* divsi */
-+  COSTS_N_INSNS (19),   /* divdi */
-+  COSTS_N_INSNS (3),    /* fp */
-+  COSTS_N_INSNS (4),    /* dmul */
-+  COSTS_N_INSNS (18),   /* sdiv */
-+  COSTS_N_INSNS (33),   /* ddiv */
-+};
-+
- /* Instruction costs on POWER4 and POWER5 processors.  */
- static const
- struct processor_costs power4_cost = {
-@@ -1420,6 +1435,8 @@ rs6000_override_options (const char *def
- 	 {"8540", PROCESSOR_PPC8540, POWERPC_BASE_MASK | MASK_STRICT_ALIGN},
- 	 /* 8548 has a dummy entry for now.  */
- 	 {"8548", PROCESSOR_PPC8540, POWERPC_BASE_MASK | MASK_STRICT_ALIGN},
-+	 {"e300c2", PROCESSOR_PPCE300C2, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
-+	 {"e300c3", PROCESSOR_PPCE300C3, POWERPC_BASE_MASK},
- 	 {"860", PROCESSOR_MPCCORE, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
- 	 {"970", PROCESSOR_POWER4,
- 	  POWERPC_7400_MASK | MASK_PPC_GPOPT | MASK_MFCRF | MASK_POWERPC64},
-@@ -1845,6 +1862,11 @@ rs6000_override_options (const char *def
- 	rs6000_cost = &ppc8540_cost;
- 	break;
- 
-+      case PROCESSOR_PPCE300C2:
-+      case PROCESSOR_PPCE300C3:
-+	rs6000_cost = &ppce300c2c3_cost;
-+	break;
-+
-       case PROCESSOR_POWER4:
-       case PROCESSOR_POWER5:
- 	rs6000_cost = &power4_cost;
-@@ -18606,6 +18628,8 @@ rs6000_issue_rate (void)
-   case CPU_PPC7400:
-   case CPU_PPC8540:
-   case CPU_CELL:
-+  case CPU_PPCE300C2:
-+  case CPU_PPCE300C3:
-     return 2;
-   case CPU_RIOS2:
-   case CPU_PPC604:
-Index: gcc-4.3.1/gcc/config/rs6000/rs6000.h
-===================================================================
---- gcc-4.3.1.orig/gcc/config/rs6000/rs6000.h	2008-01-26 09:18:35.000000000 -0800
-+++ gcc-4.3.1/gcc/config/rs6000/rs6000.h	2008-08-23 16:55:30.000000000 -0700
-@@ -117,6 +117,8 @@
- %{mcpu=G5: -mpower4 -maltivec} \
- %{mcpu=8540: -me500} \
- %{mcpu=8548: -me500} \
-+%{mcpu=e300c2: -mppc} \
-+%{mcpu=e300c3: -mppc -mpmr} \
- %{maltivec: -maltivec} \
- -many"
- 
-@@ -262,6 +264,8 @@ enum processor_type
-    PROCESSOR_PPC7400,
-    PROCESSOR_PPC7450,
-    PROCESSOR_PPC8540,
-+   PROCESSOR_PPCE300C2,
-+   PROCESSOR_PPCE300C3,
-    PROCESSOR_POWER4,
-    PROCESSOR_POWER5,
-    PROCESSOR_POWER6,
-Index: gcc-4.3.1/gcc/config/rs6000/rs6000.md
-===================================================================
---- gcc-4.3.1.orig/gcc/config/rs6000/rs6000.md	2008-02-13 16:14:45.000000000 -0800
-+++ gcc-4.3.1/gcc/config/rs6000/rs6000.md	2008-08-23 16:57:29.000000000 -0700
-@@ -133,7 +133,7 @@
- ;; Processor type -- this attribute must exactly match the processor_type
- ;; enumeration in rs6000.h.
- 
--(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,power4,power5,power6,cell"
-+(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,power4,power5,power6,cell,ppce300c2,ppce300c3"
-   (const (symbol_ref "rs6000_cpu_attr")))
- 
- 
-@@ -166,6 +166,7 @@
- (include "7xx.md")
- (include "7450.md")
- (include "8540.md")
-+(include "e300c2c3.md")
- (include "power4.md")
- (include "power5.md")
- (include "power6.md")
-Index: gcc-4.3.1/gcc/config.gcc
-===================================================================
---- gcc-4.3.1.orig/gcc/config.gcc	2008-08-23 16:49:43.000000000 -0700
-+++ gcc-4.3.1/gcc/config.gcc	2008-08-23 17:03:55.000000000 -0700
-@@ -3144,7 +3144,7 @@ case "${target}" in
- 			| rios | rios1 | rios2 | rsc | rsc1 | rs64a \
- 			| 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
- 			| 601 | 602 | 603 | 603e | ec603e | 604 \
--			| 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
-+			| 604e | 620 | 630 | 740 | 750 | 7400 | 7450 | e300c[23] \
- 			| 854[08] | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell)
- 				# OK
- 				;;
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch
deleted file mode 100644
index 81522a8..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@ 
-Change gcc build : Enable m4 and m4-nofpu (needed for kernel) for sh4-gnu-linux
-
-Signed-off-by: Carl Shaw <carl.shaw@st.com>
-
-Index: gcc/gcc/config.gcc
-===================================================================
---- gcc.orig/gcc/config.gcc	2008-07-18 10:37:54.000000000 +0100
-+++ gcc/gcc/config.gcc	2008-07-18 11:00:42.000000000 +0100
-@@ -2097,11 +2097,12 @@
- 	if test x${sh_multilibs} = x ; then
- 		case ${target} in
- 		sh64-superh-linux* | \
--		sh[1234]*)	sh_multilibs=${sh_cpu_target} ;;
- 		sh64* | sh5*)	sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;;
--		sh-superh-*)	sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;;
-+		sh-superh-* | \
-+		sh4-*-linux*)	sh_multilibs=m4,m4-nofpu ;;
- 		sh*-*-linux*)	sh_multilibs=m1,m3e,m4 ;;
- 		sh*-*-netbsd*)	sh_multilibs=m3,m3e,m4 ;;
-+		sh[1234]*)	sh_multilibs=${sh_cpu_target} ;;
- 		*) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single ;;
- 		esac
- 		if test x$with_fp = xno; then
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
deleted file mode 100644
index f33e6c1..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
----
- configure    |    2 +-
- configure.ac |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: gcc-4.3.1/configure.ac
-===================================================================
---- gcc-4.3.1.orig/configure.ac	2008-07-21 12:29:18.000000000 -0700
-+++ gcc-4.3.1/configure.ac	2008-07-21 12:29:35.000000000 -0700
-@@ -2352,7 +2352,7 @@ fi
- # for target_alias and gcc doesn't manage it consistently.
- target_configargs="--cache-file=./config.cache ${target_configargs}"
- 
--FLAGS_FOR_TARGET=
-+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
- case " $target_configdirs " in
-  *" newlib "*)
-   case " $target_configargs " in
-Index: gcc-4.3.1/configure
-===================================================================
---- gcc-4.3.1.orig/configure	2008-07-21 12:29:48.000000000 -0700
-+++ gcc-4.3.1/configure	2008-07-21 12:29:59.000000000 -0700
-@@ -5841,7 +5841,7 @@ fi
- # for target_alias and gcc doesn't manage it consistently.
- target_configargs="--cache-file=./config.cache ${target_configargs}"
- 
--FLAGS_FOR_TARGET=
-+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
- case " $target_configdirs " in
-  *" newlib "*)
-   case " $target_configargs " in
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
deleted file mode 100644
index 1d3936b..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ /dev/null
@@ -1,6691 +0,0 @@ 
-Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it.
-
-This alternative patch is better because it lets you just use CFLAGS_FOR_TARGET to set the compilation flags for libgcc. Since bootstrapped target libraries are never compiled with the native compiler, it makes little sense to use different flags for stage1 and later stages. And it also makes little sense to use a different variable than CFLAGS_FOR_TARGET.
-
-Other changes I had to do include:
-
-- moving the creation of default CFLAGS_FOR_TARGET from Makefile.am to configure.ac, because otherwise the BOOT_CFLAGS are substituted into CFLAGS_FOR_TARGET (which is "-O2 -g $(CFLAGS)") via $(CFLAGS). It is also cleaner this way though.
-
-- passing the right CFLAGS to configure scripts as exported environment variables
-
-I also stopped passing LIBCFLAGS to configure scripts since they are unused in the whole src tree. And I updated the documentation as H-P reminded me to do.
-
-Bootstrapped/regtested i686-pc-linux-gnu, will commit to 4.4 shortly. Ok for 4.3?
-
-Paolo
-
-2008-02-19  Paolo Bonzini  <bonzini@gnu.org>
-
-        PR bootstrap/32009
-        PR bootstrap/32161
-
-	* configure.ac (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Compute here.
-	* configure: Regenerate.
-
-	* Makefile.def: Define stage_libcflags for all bootstrap stages.
-	* Makefile.tpl (BOOT_LIBCFLAGS, STAGE2_LIBCFLAGS, STAGE3_LIBCFLAGS,
-	STAGE4_LIBCFLAGS): New.
-	(CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Subst from autoconf, without
-	$(SYSROOT_CFLAGS_FOR_TARGET) and $(DEBUG_PREFIX_CFLAGS_FOR_TARGET).
-	(BASE_TARGET_EXPORTS): Append them here to C{,XX}FLAGS.
-	(EXTRA_TARGET_FLAGS): Append them here to {LIB,}C{,XX}FLAGS.
-	(configure-stage[+id+]-[+prefix+][+module+]): Pass stage_libcflags
-	for target modules.  Don't export LIBCFLAGS.
-	(all-stage[+id+]-[+prefix+][+module+]): Pass stage_libcflags; pass
-	$(BASE_FLAGS_TO_PASS) where [+args+] was passed, and [+args+] after
-	the overridden CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
-	(invocations of `all'): Replace $(TARGET_FLAGS_TO_PASS) with
-	$(EXTRA_TARGET_FLAGS), $(FLAGS_TO_PASS) with $(EXTRA_HOST_FLAGS).
-	* Makefile.in: Regenerate.
-
-config:
-2008-02-19  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/32009
-	* mh-ppc-darwin (BOOT_CFLAGS): Reenable.
-
-gcc:
-2008-02-19  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/32009
-	* doc/install.texi: Correct references to CFLAGS, replacing them
-	with BOOT_CFLAGS.  Document flags used during bootstrap for
-	target libraries.
-
-
----
- Makefile.def           |   25 
- Makefile.in            | 1845 ++++++++++++++++++++++++++++++-------------------
- Makefile.tpl           |   91 +-
- config/mh-ppc-darwin   |    3 
- configure              |   36 
- configure.ac           |   32 
- gcc/Makefile.in        |    2 
- gcc/configure          |    6 
- gcc/configure.ac       |    3 
- gcc/doc/install.texi   |   56 -
- libiberty/Makefile.in  |  162 ++--
- libiberty/configure    |   46 -
- libiberty/configure.ac |   43 -
- 13 files changed, 1454 insertions(+), 896 deletions(-)
-
-Index: gcc-4.3.3/configure.ac
-===================================================================
---- gcc-4.3.3.orig/configure.ac	2008-02-01 20:29:30.000000000 -0700
-+++ gcc-4.3.3/configure.ac	2009-04-29 18:03:50.025603468 -0700
-@@ -1667,6 +1667,38 @@
-   [DEBUG_PREFIX_CFLAGS_FOR_TARGET=])
- AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
- 
-+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
-+# might be empty or "-g".  We don't require a C++ compiler, so CXXFLAGS
-+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
-+# We want to ensure that TARGET libraries (which we know are built with
-+# gcc) are built with "-O2 -g", so include those options when setting
-+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
-+if test "x$CFLAGS_FOR_TARGET" = x; then
-+  CFLAGS_FOR_TARGET=$CFLAGS
-+  case " $CFLAGS " in
-+    *" -O2 "*) ;;
-+    *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
-+  esac
-+  case " $CFLAGS " in
-+    *" -g "* | *" -g3 "*) ;;
-+    *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
-+  esac
-+fi
-+AC_SUBST(CFLAGS_FOR_TARGET)
-+
-+if test "x$CXXFLAGS_FOR_TARGET" = x; then
-+  CXXFLAGS_FOR_TARGET=$CXXFLAGS
-+  case " $CXXFLAGS " in
-+    *" -O2 "*) ;;
-+    *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
-+  esac
-+  case " $CXXFLAGS " in
-+    *" -g "* | *" -g3 "*) ;;
-+    *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
-+  esac
-+fi
-+AC_SUBST(CXXFLAGS_FOR_TARGET)
-+
- # Handle --with-headers=XXX.  If the value is not "yes", the contents of
- # the named directory are copied to $(tooldir)/sys-include.
- if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
-Index: gcc-4.3.3/Makefile.def
-===================================================================
---- gcc-4.3.3.orig/Makefile.def	2007-10-23 08:53:18.000000000 -0700
-+++ gcc-4.3.3/Makefile.def	2009-04-29 18:03:50.029603058 -0700
-@@ -214,6 +214,7 @@
- flags_to_pass = { flag= INSTALL_DATA ; };
- flags_to_pass = { flag= INSTALL_PROGRAM ; };
- flags_to_pass = { flag= INSTALL_SCRIPT ; };
-+flags_to_pass = { flag= LDFLAGS_FOR_BUILD ; };
- flags_to_pass = { flag= LEX ; };
- flags_to_pass = { flag= M4 ; };
- flags_to_pass = { flag= MAKE ; };
-@@ -511,43 +512,51 @@
- 	//   compiler probably has never heard of them.
- 	stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \
- 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
--	stage_cflags='$(STAGE1_CFLAGS)' ; };
-+	stage_cflags='$(STAGE1_CFLAGS)' ;
-+	stage_libcflags='$(STAGE1_LIBCFLAGS)' ; };
- bootstrap_stage = {
- 	id=2 ; prev=1 ;
- 	bootstrap_target=bootstrap2 ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags="$(STAGE2_CFLAGS)" ; };
-+	stage_cflags="$(STAGE2_CFLAGS)" ;
-+	stage_libcflags="$(STAGE2_LIBCFLAGS)" ; };
- bootstrap_stage = {
- 	id=b2g0 ; prev=1 ;
- 	bootstrap_target=bootstrap2-debug ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags="$(STAGE2_CFLAGS) -g0" ; };
-+	stage_cflags="$(STAGE2_CFLAGS) -g0" ;
-+	stage_libcflags="$(STAGE2_LIBCFLAGS) -g0" ; };
- bootstrap_stage = {
- 	id=3 ; prev=2 ; lean=1 ;
- 	compare_target=compare ;
- 	bootstrap_target=bootstrap ;
- 	cleanstrap_target=cleanstrap ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags="$(STAGE3_CFLAGS)" ; };
-+	stage_cflags="$(STAGE3_CFLAGS)" ;
-+	stage_libcflags="$(STAGE3_LIBCFLAGS)" ; };
- bootstrap_stage = {
- 	id=b3g2 ; prev=b2g0 ; lean=1 ;
- 	compare_target=compare-debug ;
- 	bootstrap_target=bootstrap-debug ;
- 	cleanstrap_target=cleanstrap-debug ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags="$(STAGE3_CFLAGS) -g2" ; };
-+	stage_cflags="$(STAGE3_CFLAGS) -g2" ;
-+	stage_libcflags="$(STAGE3_LIBCFLAGS) -g2" ; };
- bootstrap_stage = {
- 	id=4 ; prev=3 ; lean=2 ;
- 	compare_target=compare3 ;
- 	bootstrap_target=bootstrap4 ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags="$(STAGE4_CFLAGS)" ; };
-+	stage_cflags="$(STAGE4_CFLAGS)" ;
-+	stage_libcflags="$(STAGE4_CFLAGS)" ; };
- bootstrap_stage = {
- 	id=profile ; prev=1 ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; };
-+	stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ;
-+	stage_libcflags='$(STAGE2_LIBCFLAGS) -fprofile-generate' ; };
- bootstrap_stage = {
- 	id=feedback ; prev=profile ;
- 	bootstrap_target=profiledbootstrap ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; };
-+	stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ;
-+	stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; };
-Index: gcc-4.3.3/Makefile.tpl
-===================================================================
---- gcc-4.3.3.orig/Makefile.tpl	2008-08-16 00:28:01.000000000 -0700
-+++ gcc-4.3.3/Makefile.tpl	2009-04-29 18:04:16.836611837 -0700
-@@ -23,6 +23,14 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- 
-+# First, test for a proper version of make, but only where one is required.
-+
-+@if gcc
-+ifeq (,$(.VARIABLES)) # The variable .VARIABLES, new with 3.80, is never empty.
-+$(error GNU make version 3.80 or newer is required.)
-+endif
-+@endif gcc
-+
- # -------------------------------
- # Standard Autoconf-set variables
- # -------------------------------
-@@ -139,6 +147,13 @@
- 	WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
- 	WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
- 
-+# These variables must be set on the make command line for directories
-+# built for the build system to override those in BASE_FLAGS_TO_PASSS.
-+EXTRA_BUILD_FLAGS = \
-+	CFLAGS="$(CFLAGS_FOR_BUILD)" \
-+	LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
-+	LIBCFLAGS=""
-+
- # This is the list of directories to built for the host system.
- SUBDIRS = @configdirs@
- # This is set by the configure script to the arguments to use when configuring
-@@ -153,6 +168,7 @@
- HOST_EXPORTS = \
- 	$(BASE_EXPORTS) \
- 	CC="$(CC)"; export CC; \
-+	ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
- 	CFLAGS="$(CFLAGS)"; export CFLAGS; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CXX="$(CXX)"; export CXX; \
-@@ -207,10 +223,10 @@
- 	AR="$(AR_FOR_TARGET)"; export AR; \
- 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
- 	CC="$(CC_FOR_TARGET)"; export CC; \
--	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
--	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
- 	GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
- 	GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
- 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-@@ -323,7 +339,6 @@
- LIBCFLAGS = $(CFLAGS)
- CXXFLAGS = @CXXFLAGS@
- LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
--PICFLAG = 
- 
- # Only build the C compiler for stage1, because that is the only one that
- # we can guarantee will build with the native compiler, and also it is the
-@@ -331,14 +346,19 @@
- # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
- # overrideable (for a bootstrap build stage1 also builds gcc.info).
- 
--STAGE1_CFLAGS=@stage1_cflags@
- STAGE1_CHECKING=@stage1_checking@
- STAGE1_LANGUAGES=@stage1_languages@
- 
-+STAGE1_CFLAGS=@stage1_cflags@
- STAGE2_CFLAGS=$(BOOT_CFLAGS)
- STAGE3_CFLAGS=$(BOOT_CFLAGS)
- STAGE4_CFLAGS=$(BOOT_CFLAGS)
- 
-+STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+
- do-compare = @do_compare@
- do-compare3 = $(do-compare)
- do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
-@@ -377,22 +397,14 @@
- COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
- COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
- 
--# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
--# might be empty or "-g".  We don't require a C++ compiler, so CXXFLAGS
--# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
--# We want to ensure that TARGET libraries (which we know are built with
--# gcc) are built with "-O2 -g", so prepend those options when setting
--# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
--CFLAGS_FOR_TARGET = -O2 -g $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
--	$(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
-+CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
-+CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
- SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
- DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
--CXXFLAGS_FOR_TARGET = -O2 -g $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
--	$(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
-+
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
--PICFLAG_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@
- 
- # ------------------------------------
- # Miscellaneous targets and flag lists
-@@ -492,19 +504,20 @@
- # Flags to pass down to makes which are built with the target environment.
- # The double $ decreases the length of the command line; those variables
- # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
--# COMPILER_ prefixed variables are not passed down so we expand them here.
-+# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty,
-+# so we expand them here.
- EXTRA_TARGET_FLAGS = \
- 	'AR=$$(AR_FOR_TARGET)' \
- 	'AS=$(COMPILER_AS_FOR_TARGET)' \
- 	'CC=$$(CC_FOR_TARGET)' \
--	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-+	'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
- 	'CXX=$$(CXX_FOR_TARGET)' \
--	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
-+	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
- 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
- 	'LD=$(COMPILER_LD_FOR_TARGET)' \
- 	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
--	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
--	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
-+	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
-+	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
- 	'NM=$(COMPILER_NM_FOR_TARGET)' \
- 	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
- 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
-@@ -852,9 +865,11 @@
- 	fi; \
- 	[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
- 	[+exports+][+ IF prev +] \
--	[+poststage1_exports+][+ ENDIF prev +] \
-+	[+poststage1_exports+][+ ENDIF prev +] [+ IF prefix +] \
-+	CFLAGS="[+stage_libcflags+] $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="[+stage_libcflags+] $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; [+ ELSE +] \
- 	CFLAGS="[+stage_cflags+]"; export CFLAGS; \
--	LIBCFLAGS="[+stage_cflags+]"; export LIBCFLAGS; \
-+	CXXFLAGS="[+stage_cflags+]"; export CXXFLAGS; [+ ENDIF +] \
- 	echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
- 	cd [+subdir+]/[+module+] || exit 1; \
-@@ -891,7 +906,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	[+exports+] \
- 	(cd [+subdir+]/[+module+] && \
--	  $(MAKE) [+args+] [+extra_make_flags+] $(TARGET-[+prefix+][+module+]))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) [+args+] [+extra_make_flags+] \
-+		$(TARGET-[+prefix+][+module+]))
- @endif [+prefix+][+module+]
- 
- [+ IF bootstrap +]
-@@ -911,8 +927,11 @@
- 	[+exports+][+ IF prev +] \
- 	[+poststage1_exports+][+ ENDIF prev +] \
- 	cd [+subdir+]/[+module+] && \
--	$(MAKE) [+args+] \
--		CFLAGS="[+stage_cflags+]" LIBCFLAGS="[+stage_cflags+]" [+
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="[+stage_cflags+]" CXXFLAGS="[+stage_cflags+]" \
-+		LIBCFLAGS="[+stage_libcflags+]" \
-+		CFLAGS_FOR_TARGET="[+stage_libcflags+]" \
-+		CXXFLAGS_FOR_TARGET="[+stage_libcflags+]" [+args+] [+
- 		IF prev +][+poststage1_args+][+ ENDIF prev
- 		+] [+extra_make_flags+] \
- 		$(TARGET-stage[+id+]-[+prefix+][+module+])
-@@ -945,7 +964,8 @@
- 	     target_alias=(get "target" "${target_alias}")
- 	     args="$(BUILD_CONFIGARGS)" no-config-site=true +]
- 
--[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +]
-+[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)"
-+	     args="$(EXTRA_BUILD_FLAGS)" +]
- [+ ENDFOR build_module +]
- 
- # --------------------------------------
-@@ -962,7 +982,7 @@
- [+ all prefix="" subdir="$(HOST_SUBDIR)"
-        exports="$(HOST_EXPORTS)"
-        poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)"
--       args="$(FLAGS_TO_PASS)"
-+       args="$(EXTRA_HOST_FLAGS)"
-        poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +]
- 
- .PHONY: check-[+module+] maybe-check-[+module+]
-@@ -1060,7 +1080,7 @@
- 
- [+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
-        exports="$(RAW_CXX_TARGET_EXPORTS)"
--       args="$(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
-+       args="$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
- [+ ELSE +]
- [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
- 	     check_multilibs=true
-@@ -1071,7 +1091,7 @@
- 
- [+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
-        exports="$(NORMAL_TARGET_EXPORTS)"
--       args="$(TARGET_FLAGS_TO_PASS)" +]
-+       args="$(EXTRA_TARGET_FLAGS)" +]
- [+ ENDIF +]
- 
- .PHONY: check-target-[+module+] maybe-check-target-[+module+]
-@@ -1301,7 +1321,7 @@
- 
- # Bubble a bug fix through all the stages up to stage [+id+].  They are
- # remade, but not reconfigured.  The next stage (if any) will not be
--# reconfigured as well.
-+# reconfigured either.
- .PHONY: stage[+id+]-bubble
- stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +]
- 	@r=`${PWD_COMMAND}`; export r; \
-@@ -1440,11 +1460,11 @@
- 	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
- 
- .PHONY: restrap
--restrap:
-+restrap::
- 	@: $(MAKE); $(stage)
- 	rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev
- 	  +]stage[+id+]-* [+ ENDIF prev +][+ ENDFOR bootstrap-stage +]
--	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
-+restrap:: all
- @endif gcc-bootstrap
- 
- # --------------------------------------
-@@ -1475,7 +1495,7 @@
- 
- [+ ;; These Scheme functions build the bulk of the dependencies.
-    ;; dep-target builds a string like "maybe-all-MODULE_KIND-gcc",
--   ;; where "maybe-" is only included if HARD is true, and all-gcc
-+   ;; where "maybe-" is only included if HARD is not true, and all-gcc
-    ;; is taken from VAR-NAME.
-    (define dep-target (lambda (module-kind var-name hard)
-       (string-append
-@@ -1633,7 +1653,8 @@
- 
- # Rebuilding configure.
- AUTOCONF = autoconf
--$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4
-+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \
-+	$(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4
- 	cd $(srcdir) && $(AUTOCONF)
- 
- # ------------------------------
-Index: gcc-4.3.3/config/mh-ppc-darwin
-===================================================================
---- gcc-4.3.3.orig/config/mh-ppc-darwin	2007-05-23 07:26:31.000000000 -0700
-+++ gcc-4.3.3/config/mh-ppc-darwin	2009-04-29 18:03:50.057603252 -0700
-@@ -2,5 +2,4 @@
- # position-independent-code -- the usual default on Darwin. This fix speeds
- # compiles by 3-5%.
- 
--# Broken because of PR32009.
--# BOOT_CFLAGS=-g -O2 -mdynamic-no-pic
-+BOOT_CFLAGS=-g -O2 -mdynamic-no-pic
-Index: gcc-4.3.3/gcc/doc/install.texi
-===================================================================
---- gcc-4.3.3.orig/gcc/doc/install.texi	2009-01-06 17:52:26.000000000 -0700
-+++ gcc-4.3.3/gcc/doc/install.texi	2009-04-29 18:03:50.065603803 -0700
-@@ -1778,33 +1778,35 @@
- stage2 of the 3-stage bootstrap of the compiler are deleted as
- soon as they are no longer needed.
- 
--If you want to save additional space during the bootstrap and in
--the final installation as well, you can build the compiler binaries
--without debugging information as in the following example.  This will save
--roughly 40% of disk space both for the bootstrap and the final installation.
--(Libraries will still contain debugging information.)
--
--@smallexample
--     make CFLAGS='-O' LIBCFLAGS='-g -O2' \
--       LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap
--@end smallexample
--
--If you wish to use non-default GCC flags when compiling the stage2 and
--stage3 compilers, set @code{BOOT_CFLAGS} on the command line when doing
--@samp{make}.  Non-default optimization flags are less well
--tested here than the default of @samp{-g -O2}, but should still work.
--In a few cases, you may find that you need to specify special flags such
--as @option{-msoft-float} here to complete the bootstrap; or, if the
--native compiler miscompiles the stage1 compiler, you may need to work
--around this, by choosing @code{BOOT_CFLAGS} to avoid the parts of the
--stage1 compiler that were miscompiled, or by using @samp{make
-+If you wish to use non-default GCC flags when compiling the stage2
-+and stage3 compilers, set @code{BOOT_CFLAGS} on the command line when
-+doing @samp{make}.  For example, if you want to save additional space
-+during the bootstrap and in the final installation as well, you can
-+build the compiler binaries without debugging information as in the
-+following example.  This will save roughly 40% of disk space both for
-+the bootstrap and the final installation.  (Libraries will still contain
-+debugging information.)
-+
-+@smallexample
-+     make BOOT_CFLAGS='-O' bootstrap
-+@end smallexample
-+
-+You can place non-default optimization flags into @code{BOOT_CFLAGS}; they
-+are less well tested here than the default of @samp{-g -O2}, but should
-+still work.  In a few cases, you may find that you need to specify special
-+flags such as @option{-msoft-float} here to complete the bootstrap; or,
-+if the native compiler miscompiles the stage1 compiler, you may need
-+to work around this, by choosing @code{BOOT_CFLAGS} to avoid the parts
-+of the stage1 compiler that were miscompiled, or by using @samp{make
- bootstrap4} to increase the number of stages of bootstrap.
- 
--Note that using non-standard @code{CFLAGS} can cause bootstrap to fail
--if these trigger a warning with the new compiler.  For example using
--@samp{-O2 -g -mcpu=i686} on @code{i686-pc-linux-gnu} will cause bootstrap
--failure as @option{-mcpu=} is deprecated in 3.4.0 and above.
--
-+@code{BOOT_CFLAGS} does not apply to bootstrapped target libraries.
-+Since these are always compiled with the compiler currently being
-+bootstrapped, you can use @code{CFLAGS_FOR_TARGET} to modify their
-+compilation flags, as for non-bootstrapped target libraries.
-+Again, if the native compiler miscompiles the stage1 compiler, you may
-+need to work around this by avoiding non-working parts of the stage1
-+compiler.  Use @code{STAGE1_LIBCFLAGS} to this end.
- 
- If you used the flag @option{--enable-languages=@dots{}} to restrict
- the compilers to be built, only those you've actually enabled will be
-@@ -2687,8 +2689,8 @@
- stamp.
- 
- @samp{make compare} may fail on old versions of DEC Unix unless you add
--@option{-save-temps} to @code{CFLAGS}.  On these systems, the name of the
--assembler input file is stored in the object file, and that makes
-+@option{-save-temps} to @code{BOOT_CFLAGS}.  On these systems, the name
-+of the assembler input file is stored in the object file, and that makes
- comparison fail if it differs between the @code{stage1} and
- @code{stage2} compilations.  The option @option{-save-temps} forces a
- fixed name to be used for the assembler input file, instead of a
-Index: gcc-4.3.3/Makefile.in
-===================================================================
---- gcc-4.3.3.orig/Makefile.in	2008-08-16 00:28:01.000000000 -0700
-+++ gcc-4.3.3/Makefile.in	2009-04-29 18:04:32.133111439 -0700
-@@ -20,6 +20,14 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- 
-+# First, test for a proper version of make, but only where one is required.
-+
-+@if gcc
-+ifeq (,$(.VARIABLES)) # The variable .VARIABLES, new with 3.80, is never empty.
-+$(error GNU make version 3.80 or newer is required.)
-+endif
-+@endif gcc
-+
- # -------------------------------
- # Standard Autoconf-set variables
- # -------------------------------
-@@ -136,6 +144,13 @@
- 	WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
- 	WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
- 
-+# These variables must be set on the make command line for directories
-+# built for the build system to override those in BASE_FLAGS_TO_PASSS.
-+EXTRA_BUILD_FLAGS = \
-+	CFLAGS="$(CFLAGS_FOR_BUILD)" \
-+	LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
-+	LIBCFLAGS=""
-+
- # This is the list of directories to built for the host system.
- SUBDIRS = @configdirs@
- # This is set by the configure script to the arguments to use when configuring
-@@ -150,6 +165,7 @@
- HOST_EXPORTS = \
- 	$(BASE_EXPORTS) \
- 	CC="$(CC)"; export CC; \
-+	ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
- 	CFLAGS="$(CFLAGS)"; export CFLAGS; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CXX="$(CXX)"; export CXX; \
-@@ -204,10 +220,10 @@
- 	AR="$(AR_FOR_TARGET)"; export AR; \
- 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
- 	CC="$(CC_FOR_TARGET)"; export CC; \
--	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
--	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
- 	GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
- 	GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
- 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-@@ -320,7 +336,6 @@
- LIBCFLAGS = $(CFLAGS)
- CXXFLAGS = @CXXFLAGS@
- LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
--PICFLAG = 
- 
- # Only build the C compiler for stage1, because that is the only one that
- # we can guarantee will build with the native compiler, and also it is the
-@@ -328,14 +343,19 @@
- # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
- # overrideable (for a bootstrap build stage1 also builds gcc.info).
- 
--STAGE1_CFLAGS=@stage1_cflags@
- STAGE1_CHECKING=@stage1_checking@
- STAGE1_LANGUAGES=@stage1_languages@
- 
-+STAGE1_CFLAGS=@stage1_cflags@
- STAGE2_CFLAGS=$(BOOT_CFLAGS)
- STAGE3_CFLAGS=$(BOOT_CFLAGS)
- STAGE4_CFLAGS=$(BOOT_CFLAGS)
- 
-+STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+
- do-compare = @do_compare@
- do-compare3 = $(do-compare)
- do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
-@@ -374,22 +394,14 @@
- COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
- COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
- 
--# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
--# might be empty or "-g".  We don't require a C++ compiler, so CXXFLAGS
--# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
--# We want to ensure that TARGET libraries (which we know are built with
--# gcc) are built with "-O2 -g", so prepend those options when setting
--# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
--CFLAGS_FOR_TARGET = -O2 -g $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
--	$(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
-+CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
-+CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
- SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
- DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
--CXXFLAGS_FOR_TARGET = -O2 -g $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
--	$(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
-+
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
--PICFLAG_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@
- 
- # ------------------------------------
- # Miscellaneous targets and flag lists
-@@ -496,6 +508,7 @@
- 	"INSTALL_DATA=$(INSTALL_DATA)" \
- 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
- 	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-+	"LDFLAGS_FOR_BUILD=$(LDFLAGS_FOR_BUILD)" \
- 	"LEX=$(LEX)" \
- 	"M4=$(M4)" \
- 	"MAKE=$(MAKE)" \
-@@ -592,19 +605,20 @@
- # Flags to pass down to makes which are built with the target environment.
- # The double $ decreases the length of the command line; those variables
- # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
--# COMPILER_ prefixed variables are not passed down so we expand them here.
-+# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty,
-+# so we expand them here.
- EXTRA_TARGET_FLAGS = \
- 	'AR=$$(AR_FOR_TARGET)' \
- 	'AS=$(COMPILER_AS_FOR_TARGET)' \
- 	'CC=$$(CC_FOR_TARGET)' \
--	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-+	'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
- 	'CXX=$$(CXX_FOR_TARGET)' \
--	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
-+	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
- 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
- 	'LD=$(COMPILER_LD_FOR_TARGET)' \
- 	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
--	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
--	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
-+	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
-+	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
- 	'NM=$(COMPILER_NM_FOR_TARGET)' \
- 	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
- 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
-@@ -2738,7 +2752,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/libiberty && \
--	  $(MAKE)   $(TARGET-build-libiberty))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
-+		$(TARGET-build-libiberty))
- @endif build-libiberty
- 
- 
-@@ -2793,7 +2808,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/bison && \
--	  $(MAKE)   $(TARGET-build-bison))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
-+		$(TARGET-build-bison))
- @endif build-bison
- 
- 
-@@ -2848,7 +2864,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/byacc && \
--	  $(MAKE)   $(TARGET-build-byacc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
-+		$(TARGET-build-byacc))
- @endif build-byacc
- 
- 
-@@ -2903,7 +2920,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/flex && \
--	  $(MAKE)   $(TARGET-build-flex))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
-+		$(TARGET-build-flex))
- @endif build-flex
- 
- 
-@@ -2958,7 +2976,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/m4 && \
--	  $(MAKE)   $(TARGET-build-m4))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
-+		$(TARGET-build-m4))
- @endif build-m4
- 
- 
-@@ -3013,7 +3032,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/texinfo && \
--	  $(MAKE)   $(TARGET-build-texinfo))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
-+		$(TARGET-build-texinfo))
- @endif build-texinfo
- 
- 
-@@ -3068,7 +3088,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/fixincludes && \
--	  $(MAKE)   $(TARGET-build-fixincludes))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
-+		$(TARGET-build-fixincludes))
- @endif build-fixincludes
- 
- 
-@@ -3127,7 +3148,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/ash && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ash))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-ash))
- @endif ash
- 
- 
-@@ -3551,7 +3573,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/autoconf && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-autoconf))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-autoconf))
- @endif autoconf
- 
- 
-@@ -3975,7 +3998,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/automake && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-automake))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-automake))
- @endif automake
- 
- 
-@@ -4399,7 +4423,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/bash && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bash))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-bash))
- @endif bash
- 
- 
-@@ -4816,9 +4841,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4847,9 +4872,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4878,9 +4903,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4909,9 +4934,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4940,9 +4965,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4971,9 +4996,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -5002,9 +5027,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -5033,9 +5058,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -5070,7 +5095,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/bfd && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bfd))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-bfd))
- @endif bfd
- 
- 
-@@ -5089,8 +5115,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-bfd)
- 
- maybe-clean-stage1-bfd: clean-stage1-bfd
-@@ -5103,7 +5132,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif bfd-bootstrap
- 
-@@ -5123,8 +5152,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-bfd)
- 
- maybe-clean-stage2-bfd: clean-stage2-bfd
-@@ -5137,7 +5169,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5158,8 +5190,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-bfd)
- 
- maybe-clean-stageb2g0-bfd: clean-stageb2g0-bfd
-@@ -5172,7 +5207,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5193,8 +5228,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-bfd)
- 
- maybe-clean-stage3-bfd: clean-stage3-bfd
-@@ -5207,7 +5245,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5228,8 +5266,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-bfd)
- 
- maybe-clean-stageb3g2-bfd: clean-stageb3g2-bfd
-@@ -5242,7 +5283,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5263,8 +5304,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-bfd)
- 
- maybe-clean-stage4-bfd: clean-stage4-bfd
-@@ -5277,7 +5321,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5298,8 +5342,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-bfd)
- 
- maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
-@@ -5312,7 +5359,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5333,8 +5380,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-bfd)
- 
- maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
-@@ -5347,7 +5397,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5754,9 +5804,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5785,9 +5835,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5816,9 +5866,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5847,9 +5897,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5878,9 +5928,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5909,9 +5959,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5940,9 +5990,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5971,9 +6021,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -6008,7 +6058,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/opcodes && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-opcodes))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-opcodes))
- @endif opcodes
- 
- 
-@@ -6027,8 +6078,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-opcodes)
- 
- maybe-clean-stage1-opcodes: clean-stage1-opcodes
-@@ -6041,7 +6095,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif opcodes-bootstrap
- 
-@@ -6061,8 +6115,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-opcodes)
- 
- maybe-clean-stage2-opcodes: clean-stage2-opcodes
-@@ -6075,7 +6132,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6096,8 +6153,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-opcodes)
- 
- maybe-clean-stageb2g0-opcodes: clean-stageb2g0-opcodes
-@@ -6110,7 +6170,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6131,8 +6191,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-opcodes)
- 
- maybe-clean-stage3-opcodes: clean-stage3-opcodes
-@@ -6145,7 +6208,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6166,8 +6229,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-opcodes)
- 
- maybe-clean-stageb3g2-opcodes: clean-stageb3g2-opcodes
-@@ -6180,7 +6246,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6201,8 +6267,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-opcodes)
- 
- maybe-clean-stage4-opcodes: clean-stage4-opcodes
-@@ -6215,7 +6284,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6236,8 +6305,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-opcodes)
- 
- maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
-@@ -6250,7 +6322,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6271,8 +6343,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-opcodes)
- 
- maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
-@@ -6285,7 +6360,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6692,9 +6767,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6723,9 +6798,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6754,9 +6829,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6785,9 +6860,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6816,9 +6891,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6847,9 +6922,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6878,9 +6953,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6909,9 +6984,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6946,7 +7021,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/binutils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-binutils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-binutils))
- @endif binutils
- 
- 
-@@ -6965,8 +7041,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-binutils)
- 
- maybe-clean-stage1-binutils: clean-stage1-binutils
-@@ -6979,7 +7058,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif binutils-bootstrap
- 
-@@ -6999,8 +7078,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-binutils)
- 
- maybe-clean-stage2-binutils: clean-stage2-binutils
-@@ -7013,7 +7095,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7034,8 +7116,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-binutils)
- 
- maybe-clean-stageb2g0-binutils: clean-stageb2g0-binutils
-@@ -7048,7 +7133,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7069,8 +7154,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-binutils)
- 
- maybe-clean-stage3-binutils: clean-stage3-binutils
-@@ -7083,7 +7171,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7104,8 +7192,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-binutils)
- 
- maybe-clean-stageb3g2-binutils: clean-stageb3g2-binutils
-@@ -7118,7 +7209,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7139,8 +7230,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-binutils)
- 
- maybe-clean-stage4-binutils: clean-stage4-binutils
-@@ -7153,7 +7247,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7174,8 +7268,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-binutils)
- 
- maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
-@@ -7188,7 +7285,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7209,8 +7306,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-binutils)
- 
- maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
-@@ -7223,7 +7323,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7637,7 +7737,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/bison && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bison))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-bison))
- @endif bison
- 
- 
-@@ -8064,7 +8165,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/byacc && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-byacc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-byacc))
- @endif byacc
- 
- 
-@@ -8491,7 +8593,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/bzip2 && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bzip2))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-bzip2))
- @endif bzip2
- 
- 
-@@ -8915,7 +9018,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/dejagnu && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dejagnu))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-dejagnu))
- @endif dejagnu
- 
- 
-@@ -9339,7 +9443,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/diff && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-diff))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-diff))
- @endif diff
- 
- 
-@@ -9763,7 +9868,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/dosutils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dosutils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-dosutils))
- @endif dosutils
- 
- 
-@@ -10181,7 +10287,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/etc && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-etc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-etc))
- @endif etc
- 
- 
-@@ -10605,7 +10712,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/fastjar && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fastjar))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-fastjar))
- @endif fastjar
- 
- 
-@@ -11032,7 +11140,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/fileutils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fileutils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-fileutils))
- @endif fileutils
- 
- 
-@@ -11456,7 +11565,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/findutils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-findutils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-findutils))
- @endif findutils
- 
- 
-@@ -11880,7 +11990,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/find && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-find))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-find))
- @endif find
- 
- 
-@@ -12304,7 +12415,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/fixincludes && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fixincludes))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-fixincludes))
- @endif fixincludes
- 
- 
-@@ -12712,7 +12824,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/flex && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-flex))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-flex))
- @endif flex
- 
- 
-@@ -13132,9 +13245,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13163,9 +13276,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13194,9 +13307,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13225,9 +13338,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13256,9 +13369,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13287,9 +13400,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13318,9 +13431,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13349,9 +13462,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13386,7 +13499,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gas && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gas))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gas))
- @endif gas
- 
- 
-@@ -13405,8 +13519,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-gas)
- 
- maybe-clean-stage1-gas: clean-stage1-gas
-@@ -13419,7 +13536,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif gas-bootstrap
- 
-@@ -13439,8 +13556,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-gas)
- 
- maybe-clean-stage2-gas: clean-stage2-gas
-@@ -13453,7 +13573,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -13474,8 +13594,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-gas)
- 
- maybe-clean-stageb2g0-gas: clean-stageb2g0-gas
-@@ -13488,7 +13611,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -13509,8 +13632,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-gas)
- 
- maybe-clean-stage3-gas: clean-stage3-gas
-@@ -13523,7 +13649,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -13544,8 +13670,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-gas)
- 
- maybe-clean-stageb3g2-gas: clean-stageb3g2-gas
-@@ -13558,7 +13687,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -13579,8 +13708,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-gas)
- 
- maybe-clean-stage4-gas: clean-stage4-gas
-@@ -13593,7 +13725,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -13614,8 +13746,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-gas)
- 
- maybe-clean-stageprofile-gas: clean-stageprofile-gas
-@@ -13628,7 +13763,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -13649,8 +13784,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-gas)
- 
- maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
-@@ -13663,7 +13801,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -14070,9 +14208,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14101,9 +14239,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14132,9 +14270,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14163,9 +14301,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14194,9 +14332,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14225,9 +14363,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14256,9 +14394,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14287,9 +14425,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14324,7 +14462,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gcc && \
--	  $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(TARGET-gcc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \
-+		$(TARGET-gcc))
- @endif gcc
- 
- 
-@@ -14343,8 +14482,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)  $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stage1-gcc)
- 
- maybe-clean-stage1-gcc: clean-stage1-gcc
-@@ -14357,7 +14499,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
- 
-@@ -14377,8 +14519,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stage2-gcc)
- 
- maybe-clean-stage2-gcc: clean-stage2-gcc
-@@ -14391,7 +14536,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -14412,8 +14557,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stageb2g0-gcc)
- 
- maybe-clean-stageb2g0-gcc: clean-stageb2g0-gcc
-@@ -14426,7 +14574,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -14447,8 +14595,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stage3-gcc)
- 
- maybe-clean-stage3-gcc: clean-stage3-gcc
-@@ -14461,7 +14612,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -14482,8 +14633,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stageb3g2-gcc)
- 
- maybe-clean-stageb3g2-gcc: clean-stageb3g2-gcc
-@@ -14496,7 +14650,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -14517,8 +14671,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stage4-gcc)
- 
- maybe-clean-stage4-gcc: clean-stage4-gcc
-@@ -14531,7 +14688,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -14552,8 +14709,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stageprofile-gcc)
- 
- maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
-@@ -14566,7 +14726,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -14587,8 +14747,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stagefeedback-gcc)
- 
- maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
-@@ -14601,7 +14764,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -15015,7 +15178,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gawk && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gawk))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gawk))
- @endif gawk
- 
- 
-@@ -15439,7 +15603,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gettext && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gettext))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gettext))
- @endif gettext
- 
- 
-@@ -15856,9 +16021,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15887,9 +16052,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15918,9 +16083,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15949,9 +16114,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15980,9 +16145,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16011,9 +16176,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16042,9 +16207,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16073,9 +16238,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16110,7 +16275,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gmp && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gmp))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gmp))
- @endif gmp
- 
- 
-@@ -16129,8 +16295,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-gmp)
- 
- maybe-clean-stage1-gmp: clean-stage1-gmp
-@@ -16143,7 +16312,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif gmp-bootstrap
- 
-@@ -16163,8 +16332,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-gmp)
- 
- maybe-clean-stage2-gmp: clean-stage2-gmp
-@@ -16177,7 +16349,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16198,8 +16370,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-gmp)
- 
- maybe-clean-stageb2g0-gmp: clean-stageb2g0-gmp
-@@ -16212,7 +16387,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16233,8 +16408,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-gmp)
- 
- maybe-clean-stage3-gmp: clean-stage3-gmp
-@@ -16247,7 +16425,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16268,8 +16446,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-gmp)
- 
- maybe-clean-stageb3g2-gmp: clean-stageb3g2-gmp
-@@ -16282,7 +16463,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16303,8 +16484,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-gmp)
- 
- maybe-clean-stage4-gmp: clean-stage4-gmp
-@@ -16317,7 +16501,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16338,8 +16522,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-gmp)
- 
- maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
-@@ -16352,7 +16539,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16373,8 +16560,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-gmp)
- 
- maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
-@@ -16387,7 +16577,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16788,9 +16978,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16819,9 +17009,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16850,9 +17040,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16881,9 +17071,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16912,9 +17102,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16943,9 +17133,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16974,9 +17164,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -17005,9 +17195,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -17042,7 +17232,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/mpfr && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-mpfr))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-mpfr))
- @endif mpfr
- 
- 
-@@ -17061,8 +17252,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-mpfr)
- 
- maybe-clean-stage1-mpfr: clean-stage1-mpfr
-@@ -17075,7 +17269,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif mpfr-bootstrap
- 
-@@ -17095,8 +17289,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-mpfr)
- 
- maybe-clean-stage2-mpfr: clean-stage2-mpfr
-@@ -17109,7 +17306,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17130,8 +17327,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-mpfr)
- 
- maybe-clean-stageb2g0-mpfr: clean-stageb2g0-mpfr
-@@ -17144,7 +17344,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17165,8 +17365,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-mpfr)
- 
- maybe-clean-stage3-mpfr: clean-stage3-mpfr
-@@ -17179,7 +17382,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17200,8 +17403,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-mpfr)
- 
- maybe-clean-stageb3g2-mpfr: clean-stageb3g2-mpfr
-@@ -17214,7 +17420,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17235,8 +17441,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-mpfr)
- 
- maybe-clean-stage4-mpfr: clean-stage4-mpfr
-@@ -17249,7 +17458,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17270,8 +17479,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-mpfr)
- 
- maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
-@@ -17284,7 +17496,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17305,8 +17517,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-mpfr)
- 
- maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
-@@ -17319,7 +17534,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17727,7 +17942,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gnuserv && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnuserv))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gnuserv))
- @endif gnuserv
- 
- 
-@@ -18151,7 +18367,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gprof && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gprof))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gprof))
- @endif gprof
- 
- 
-@@ -18575,7 +18792,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gzip && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gzip))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gzip))
- @endif gzip
- 
- 
-@@ -18999,7 +19217,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/hello && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-hello))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-hello))
- @endif hello
- 
- 
-@@ -19423,7 +19642,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/indent && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-indent))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-indent))
- @endif indent
- 
- 
-@@ -19840,9 +20060,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19871,9 +20091,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19902,9 +20122,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19933,9 +20153,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19964,9 +20184,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19995,9 +20215,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -20026,9 +20246,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -20057,9 +20277,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -20094,7 +20314,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/intl && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-intl))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-intl))
- @endif intl
- 
- 
-@@ -20113,8 +20334,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-intl)
- 
- maybe-clean-stage1-intl: clean-stage1-intl
-@@ -20127,7 +20351,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif intl-bootstrap
- 
-@@ -20147,8 +20371,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-intl)
- 
- maybe-clean-stage2-intl: clean-stage2-intl
-@@ -20161,7 +20388,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20182,8 +20409,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-intl)
- 
- maybe-clean-stageb2g0-intl: clean-stageb2g0-intl
-@@ -20196,7 +20426,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20217,8 +20447,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-intl)
- 
- maybe-clean-stage3-intl: clean-stage3-intl
-@@ -20231,7 +20464,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20252,8 +20485,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-intl)
- 
- maybe-clean-stageb3g2-intl: clean-stageb3g2-intl
-@@ -20266,7 +20502,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20287,8 +20523,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-intl)
- 
- maybe-clean-stage4-intl: clean-stage4-intl
-@@ -20301,7 +20540,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20322,8 +20561,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-intl)
- 
- maybe-clean-stageprofile-intl: clean-stageprofile-intl
-@@ -20336,7 +20578,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20357,8 +20599,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-intl)
- 
- maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
-@@ -20371,7 +20616,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20785,7 +21030,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/tcl && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tcl))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-tcl))
- @endif tcl
- 
- 
-@@ -21194,7 +21440,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/itcl && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-itcl))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-itcl))
- @endif itcl
- 
- 
-@@ -21611,9 +21858,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21642,9 +21889,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21673,9 +21920,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21704,9 +21951,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21735,9 +21982,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21766,9 +22013,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21797,9 +22044,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21828,9 +22075,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21865,7 +22112,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/ld && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ld))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-ld))
- @endif ld
- 
- 
-@@ -21884,8 +22132,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-ld)
- 
- maybe-clean-stage1-ld: clean-stage1-ld
-@@ -21898,7 +22149,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif ld-bootstrap
- 
-@@ -21918,8 +22169,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-ld)
- 
- maybe-clean-stage2-ld: clean-stage2-ld
-@@ -21932,7 +22186,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -21953,8 +22207,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-ld)
- 
- maybe-clean-stageb2g0-ld: clean-stageb2g0-ld
-@@ -21967,7 +22224,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -21988,8 +22245,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-ld)
- 
- maybe-clean-stage3-ld: clean-stage3-ld
-@@ -22002,7 +22262,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -22023,8 +22283,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-ld)
- 
- maybe-clean-stageb3g2-ld: clean-stageb3g2-ld
-@@ -22037,7 +22300,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -22058,8 +22321,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-ld)
- 
- maybe-clean-stage4-ld: clean-stage4-ld
-@@ -22072,7 +22338,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -22093,8 +22359,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-ld)
- 
- maybe-clean-stageprofile-ld: clean-stageprofile-ld
-@@ -22107,7 +22376,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -22128,8 +22397,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-ld)
- 
- maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
-@@ -22142,7 +22414,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -22549,9 +22821,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22580,9 +22852,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22611,9 +22883,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22642,9 +22914,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22673,9 +22945,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22704,9 +22976,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22735,9 +23007,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22766,9 +23038,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22803,7 +23075,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/libcpp && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libcpp))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-libcpp))
- @endif libcpp
- 
- 
-@@ -22822,8 +23095,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-libcpp)
- 
- maybe-clean-stage1-libcpp: clean-stage1-libcpp
-@@ -22836,7 +23112,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif libcpp-bootstrap
- 
-@@ -22856,8 +23132,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-libcpp)
- 
- maybe-clean-stage2-libcpp: clean-stage2-libcpp
-@@ -22870,7 +23149,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -22891,8 +23170,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-libcpp)
- 
- maybe-clean-stageb2g0-libcpp: clean-stageb2g0-libcpp
-@@ -22905,7 +23187,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -22926,8 +23208,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-libcpp)
- 
- maybe-clean-stage3-libcpp: clean-stage3-libcpp
-@@ -22940,7 +23225,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -22961,8 +23246,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-libcpp)
- 
- maybe-clean-stageb3g2-libcpp: clean-stageb3g2-libcpp
-@@ -22975,7 +23263,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -22996,8 +23284,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-libcpp)
- 
- maybe-clean-stage4-libcpp: clean-stage4-libcpp
-@@ -23010,7 +23301,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -23031,8 +23322,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-libcpp)
- 
- maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
-@@ -23045,7 +23339,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -23066,8 +23360,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-libcpp)
- 
- maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
-@@ -23080,7 +23377,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -23487,9 +23784,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23518,9 +23815,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23549,9 +23846,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23580,9 +23877,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23611,9 +23908,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23642,9 +23939,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23673,9 +23970,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23704,9 +24001,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23741,7 +24038,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/libdecnumber && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libdecnumber))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-libdecnumber))
- @endif libdecnumber
- 
- 
-@@ -23760,8 +24058,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-libdecnumber)
- 
- maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
-@@ -23774,7 +24075,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif libdecnumber-bootstrap
- 
-@@ -23794,8 +24095,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-libdecnumber)
- 
- maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
-@@ -23808,7 +24112,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -23829,8 +24133,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-libdecnumber)
- 
- maybe-clean-stageb2g0-libdecnumber: clean-stageb2g0-libdecnumber
-@@ -23843,7 +24150,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -23864,8 +24171,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-libdecnumber)
- 
- maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
-@@ -23878,7 +24188,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -23899,8 +24209,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-libdecnumber)
- 
- maybe-clean-stageb3g2-libdecnumber: clean-stageb3g2-libdecnumber
-@@ -23913,7 +24226,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -23934,8 +24247,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-libdecnumber)
- 
- maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
-@@ -23948,7 +24264,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -23969,8 +24285,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-libdecnumber)
- 
- maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
-@@ -23983,7 +24302,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -24004,8 +24323,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-libdecnumber)
- 
- maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
-@@ -24018,7 +24340,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -24432,7 +24754,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/libgui && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libgui))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-libgui))
- @endif libgui
- 
- 
-@@ -24849,9 +25172,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24880,9 +25203,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24911,9 +25234,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24942,9 +25265,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24973,9 +25296,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25004,9 +25327,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25035,9 +25358,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25066,9 +25389,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25103,7 +25426,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/libiberty && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libiberty))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-libiberty))
- @endif libiberty
- 
- 
-@@ -25122,8 +25446,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-libiberty)
- 
- maybe-clean-stage1-libiberty: clean-stage1-libiberty
-@@ -25136,7 +25463,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif libiberty-bootstrap
- 
-@@ -25156,8 +25483,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-libiberty)
- 
- maybe-clean-stage2-libiberty: clean-stage2-libiberty
-@@ -25170,7 +25500,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25191,8 +25521,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-libiberty)
- 
- maybe-clean-stageb2g0-libiberty: clean-stageb2g0-libiberty
-@@ -25205,7 +25538,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25226,8 +25559,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-libiberty)
- 
- maybe-clean-stage3-libiberty: clean-stage3-libiberty
-@@ -25240,7 +25576,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25261,8 +25597,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-libiberty)
- 
- maybe-clean-stageb3g2-libiberty: clean-stageb3g2-libiberty
-@@ -25275,7 +25614,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25296,8 +25635,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-libiberty)
- 
- maybe-clean-stage4-libiberty: clean-stage4-libiberty
-@@ -25310,7 +25652,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25331,8 +25673,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-libiberty)
- 
- maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
-@@ -25345,7 +25690,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25366,8 +25711,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-libiberty)
- 
- maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
-@@ -25380,7 +25728,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25794,7 +26142,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/libtool && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtool))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-libtool))
- @endif libtool
- 
- 
-@@ -26218,7 +26567,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/m4 && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-m4))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-m4))
- @endif m4
- 
- 
-@@ -26642,7 +26992,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/make && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-make))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-make))
- @endif make
- 
- 
-@@ -27066,7 +27417,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/mmalloc && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-mmalloc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-mmalloc))
- @endif mmalloc
- 
- 
-@@ -27484,7 +27836,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/patch && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-patch))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-patch))
- @endif patch
- 
- 
-@@ -27908,7 +28261,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/perl && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-perl))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-perl))
- @endif perl
- 
- 
-@@ -28332,7 +28686,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/prms && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-prms))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-prms))
- @endif prms
- 
- 
-@@ -28756,7 +29111,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/rcs && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-rcs))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-rcs))
- @endif rcs
- 
- 
-@@ -29180,7 +29536,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/readline && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-readline))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-readline))
- @endif readline
- 
- 
-@@ -29604,7 +29961,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/release && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-release))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-release))
- @endif release
- 
- 
-@@ -30016,7 +30374,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/recode && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-recode))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-recode))
- @endif recode
- 
- 
-@@ -30440,7 +30799,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/sed && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sed))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-sed))
- @endif sed
- 
- 
-@@ -30864,7 +31224,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/send-pr && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-send-pr))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-send-pr))
- @endif send-pr
- 
- 
-@@ -31288,7 +31649,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/shellutils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-shellutils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-shellutils))
- @endif shellutils
- 
- 
-@@ -31712,7 +32074,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/sid && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sid))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-sid))
- @endif sid
- 
- 
-@@ -32136,7 +32499,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/sim && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sim))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-sim))
- @endif sim
- 
- 
-@@ -32560,7 +32924,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/tar && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tar))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-tar))
- @endif tar
- 
- 
-@@ -32984,7 +33349,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/texinfo && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-texinfo))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-texinfo))
- @endif texinfo
- 
- 
-@@ -33402,7 +33768,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/textutils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-textutils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-textutils))
- @endif textutils
- 
- 
-@@ -33826,7 +34193,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/time && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-time))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-time))
- @endif time
- 
- 
-@@ -34250,7 +34618,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/uudecode && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-uudecode))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-uudecode))
- @endif uudecode
- 
- 
-@@ -34674,7 +35043,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/wdiff && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-wdiff))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-wdiff))
- @endif wdiff
- 
- 
-@@ -35098,7 +35468,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/zip && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zip))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-zip))
- @endif zip
- 
- 
-@@ -35518,9 +35889,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35549,9 +35920,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35580,9 +35951,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35611,9 +35982,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35642,9 +36013,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35673,9 +36044,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35704,9 +36075,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35735,9 +36106,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35772,7 +36143,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/zlib && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zlib))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-zlib))
- @endif zlib
- 
- 
-@@ -35791,8 +36163,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-zlib)
- 
- maybe-clean-stage1-zlib: clean-stage1-zlib
-@@ -35805,7 +36180,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif zlib-bootstrap
- 
-@@ -35825,8 +36200,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-zlib)
- 
- maybe-clean-stage2-zlib: clean-stage2-zlib
-@@ -35839,7 +36217,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -35860,8 +36238,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-zlib)
- 
- maybe-clean-stageb2g0-zlib: clean-stageb2g0-zlib
-@@ -35874,7 +36255,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -35895,8 +36276,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-zlib)
- 
- maybe-clean-stage3-zlib: clean-stage3-zlib
-@@ -35909,7 +36293,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -35930,8 +36314,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-zlib)
- 
- maybe-clean-stageb3g2-zlib: clean-stageb3g2-zlib
-@@ -35944,7 +36331,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -35965,8 +36352,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-zlib)
- 
- maybe-clean-stage4-zlib: clean-stage4-zlib
-@@ -35979,7 +36369,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -36000,8 +36390,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-zlib)
- 
- maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
-@@ -36014,7 +36407,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -36035,8 +36428,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-zlib)
- 
- maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
-@@ -36049,7 +36445,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -36451,7 +36847,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gdb && \
--	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-gdb))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
-+		$(TARGET-gdb))
- @endif gdb
- 
- 
-@@ -36875,7 +37272,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/expect && \
--	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-expect))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
-+		$(TARGET-expect))
- @endif expect
- 
- 
-@@ -37299,7 +37697,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/guile && \
--	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-guile))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
-+		$(TARGET-guile))
- @endif guile
- 
- 
-@@ -37723,7 +38122,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/tk && \
--	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-tk))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
-+		$(TARGET-tk))
- @endif tk
- 
- 
-@@ -38147,7 +38547,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/libtermcap && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtermcap))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-libtermcap))
- @endif libtermcap
- 
- 
-@@ -38505,7 +38906,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/utils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-utils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-utils))
- @endif utils
- 
- 
-@@ -38923,7 +39325,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gnattools && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnattools))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gnattools))
- @endif gnattools
- 
- 
-@@ -39368,7 +39771,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(RAW_CXX_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  $(TARGET-target-libstdc++-v3))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-+		$(TARGET-target-libstdc++-v3))
- @endif target-libstdc++-v3
- 
- 
-@@ -39809,7 +40213,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libmudflap && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libmudflap))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libmudflap))
- @endif target-libmudflap
- 
- 
-@@ -40250,7 +40655,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libssp && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libssp))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libssp))
- @endif target-libssp
- 
- 
-@@ -40691,7 +41097,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/newlib && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-newlib))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-newlib))
- @endif target-newlib
- 
- 
-@@ -41137,9 +41544,9 @@
- 	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
--	$(NORMAL_TARGET_EXPORTS) \
--	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	$(NORMAL_TARGET_EXPORTS)  \
-+	CFLAGS="$(STAGE1_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE1_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41180,9 +41587,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41223,9 +41630,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE2_LIBCFLAGS) -g0 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE2_LIBCFLAGS) -g0 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41266,9 +41673,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE3_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE3_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41309,9 +41716,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE3_LIBCFLAGS) -g2 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE3_LIBCFLAGS) -g2 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41352,9 +41759,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE4_CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41395,9 +41802,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41438,9 +41845,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41475,7 +41882,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libgcc && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgcc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libgcc))
- @endif target-libgcc
- 
- 
-@@ -41494,8 +41902,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stage1-target-libgcc)
- 
- maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
-@@ -41508,7 +41919,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		 clean
- @endif target-libgcc-bootstrap
- 
-@@ -41528,8 +41939,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stage2-target-libgcc)
- 
- maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
-@@ -41542,7 +41956,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -41563,8 +41977,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stageb2g0-target-libgcc)
- 
- maybe-clean-stageb2g0-target-libgcc: clean-stageb2g0-target-libgcc
-@@ -41577,7 +41994,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -41598,8 +42015,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stage3-target-libgcc)
- 
- maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
-@@ -41612,7 +42032,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -41633,8 +42053,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stageb3g2-target-libgcc)
- 
- maybe-clean-stageb3g2-target-libgcc: clean-stageb3g2-target-libgcc
-@@ -41647,7 +42070,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -41668,8 +42091,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stage4-target-libgcc)
- 
- maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
-@@ -41682,7 +42108,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -41703,8 +42129,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stageprofile-target-libgcc)
- 
- maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
-@@ -41717,7 +42146,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -41738,8 +42167,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stagefeedback-target-libgcc)
- 
- maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
-@@ -41752,7 +42184,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -42191,7 +42623,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgfortran))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libgfortran))
- @endif target-libgfortran
- 
- 
-@@ -42632,7 +43065,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libobjc && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libobjc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libobjc))
- @endif target-libobjc
- 
- 
-@@ -43073,7 +43507,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libtermcap && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libtermcap))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libtermcap))
- @endif target-libtermcap
- 
- 
-@@ -43449,7 +43884,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/winsup && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-winsup))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-winsup))
- @endif target-winsup
- 
- 
-@@ -43890,7 +44326,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libgloss && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgloss))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libgloss))
- @endif target-libgloss
- 
- 
-@@ -44326,7 +44763,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libiberty && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libiberty))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libiberty))
- @endif target-libiberty
- 
- 
-@@ -44767,7 +45205,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/gperf && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-gperf))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-gperf))
- @endif target-gperf