rename packages/ to recipes/ per earlier agreement

See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
author: Denys Dmytriyenko <denis@denix.org> 2009-03-17 14:32:59 -0400
committer: Denys Dmytriyenko <denis@denix.org> 2009-03-17 14:32:59 -0400
commit: 709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree: 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/gcc/gcc-csl-arm-2008q3
parent: fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
9 files changed, 8989 insertions, 0 deletions
diff --git a/recipes/gcc/gcc-csl-arm-2008q3/arm-nolibfloat.patch b/recipes/gcc/gcc-csl-arm-2008q3/arm-nolibfloat.patch
new file mode 100644
index 0000000000..c4897c0330
--- /dev/null
+++ b/recipes/gcc/gcc-csl-arm-2008q3/arm-nolibfloat.patch
@@ -0,0 +1,24 @@
+# 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/recipes/gcc/gcc-csl-arm-2008q3/arm-softfloat.patch b/recipes/gcc/gcc-csl-arm-2008q3/arm-softfloat.patch
new file mode 100644
index 0000000000..5e1edd9208
--- /dev/null
+++ b/recipes/gcc/gcc-csl-arm-2008q3/arm-softfloat.patch
@@ -0,0 +1,16 @@
+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/recipes/gcc/gcc-csl-arm-2008q3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/recipes/gcc/gcc-csl-arm-2008q3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
new file mode 100644
index 0000000000..e3d3f5fe3f
--- /dev/null
+++ b/recipes/gcc/gcc-csl-arm-2008q3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
@@ -0,0 +1,22 @@
+--- /tmp/configure.ac	2008-11-18 09:07:49.000000000 +0100
++++ gcc-4.3/configure.ac	2008-11-18 09:09:22.000000000 +0100
+@@ -2320,7 +2320,7 @@
+ # 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
+--- /tmp/configure	2008-11-18 09:07:54.000000000 +0100
++++ gcc-4.3/configure	2008-11-18 09:08:59.000000000 +0100
+@@ -5809,7 +5809,7 @@
+ # 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/recipes/gcc/gcc-csl-arm-2008q3/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch b/recipes/gcc/gcc-csl-arm-2008q3/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch
new file mode 100644
index 0000000000..6035ef7732
--- /dev/null
+++ b/recipes/gcc/gcc-csl-arm-2008q3/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch
@@ -0,0 +1,6563 @@
+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.2/configure.ac
+===================================================================
+--- gcc-4.3.2.orig/configure.ac	2008-02-01 19:29:30.000000000 -0800
++++ gcc-4.3.2/configure.ac	2008-08-28 18:18:37.000000000 -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.2/Makefile.def
+===================================================================
+--- gcc-4.3.2.orig/Makefile.def	2007-10-23 08:53:18.000000000 -0700
++++ gcc-4.3.2/Makefile.def	2008-08-28 18:18:37.000000000 -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' ; };
+
+--- /tmp/Makefile.tpl	2008-11-18 10:06:14.000000000 +0100
++++ gcc-4.3/Makefile.tpl	2008-11-18 10:10:01.000000000 +0100
+@@ -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; \
+@@ -324,7 +340,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
+@@ -332,14 +347,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
+@@ -378,22 +398,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 = 
+ 
+ # ------------------------------------
+ # Miscellaneous targets and flag lists
+@@ -493,19 +505,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)' \
+@@ -854,9 +867,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; \
+@@ -893,7 +908,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 +]
+@@ -913,8 +929,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+])
+@@ -947,7 +966,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 +]
+ 
+ # --------------------------------------
+@@ -964,7 +984,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+]
+@@ -1062,7 +1082,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
+@@ -1073,7 +1093,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+]
+@@ -1303,7 +1323,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; \
+@@ -1442,11 +1462,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
+ 
+ # --------------------------------------
+@@ -1477,7 +1497,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
+@@ -1635,7 +1655,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.2/config/mh-ppc-darwin
+===================================================================
+--- gcc-4.3.2.orig/config/mh-ppc-darwin	2007-05-23 07:26:31.000000000 -0700
++++ gcc-4.3.2/config/mh-ppc-darwin	2008-08-28 18:18:37.000000000 -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.2/gcc/doc/install.texi
+===================================================================
+--- gcc-4.3.2.orig/gcc/doc/install.texi	2008-06-18 22:59:30.000000000 -0700
++++ gcc-4.3.2/gcc/doc/install.texi	2008-08-28 18:18:37.000000000 -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
+@@ -2695,8 +2697,8 @@
+ a few cases and may not work properly.
+ 
+ @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
+--- /tmp/Makefile.in	2008-11-18 10:20:44.000000000 +0100
++++ gcc-4.3/Makefile.in	2008-11-18 10:22:47.000000000 +0100
+@@ -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; \
+@@ -321,7 +337,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
+@@ -329,14 +344,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
+@@ -375,22 +395,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 = 
+ 
+ # ------------------------------------
+ # Miscellaneous targets and flag lists
+@@ -498,6 +510,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)" \
+@@ -594,19 +607,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)' \
+@@ -2741,7 +2755,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
+ 
+ 
+@@ -2796,7 +2811,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
+ 
+ 
+@@ -2851,7 +2867,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
+ 
+ 
+@@ -2906,7 +2923,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
+ 
+ 
+@@ -2961,7 +2979,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
+ 
+ 
+@@ -3016,7 +3035,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
+ 
+ 
+@@ -3071,7 +3091,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
+ 
+ 
+@@ -3130,7 +3151,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
+ 
+ 
+@@ -3554,7 +3576,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
+ 
+ 
+@@ -3978,7 +4001,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
+ 
+ 
+@@ -4402,7 +4426,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
+ 
+ 
+@@ -4819,9 +4844,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; \
+@@ -4850,9 +4875,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; \
+@@ -4881,9 +4906,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; \
+@@ -4912,9 +4937,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; \
+@@ -4943,9 +4968,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; \
+@@ -4974,9 +4999,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; \
+@@ -5005,9 +5030,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; \
+@@ -5036,9 +5061,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; \
+@@ -5073,7 +5098,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
+ 
+ 
+@@ -5092,8 +5118,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
+@@ -5106,7 +5135,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/bfd && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif bfd-bootstrap
+ 
+@@ -5126,8 +5155,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
+@@ -5140,7 +5172,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
+@@ -5161,8 +5193,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
+@@ -5175,7 +5210,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
+@@ -5196,8 +5231,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
+@@ -5210,7 +5248,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
+@@ -5231,8 +5269,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
+@@ -5245,7 +5286,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
+@@ -5266,8 +5307,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
+@@ -5280,7 +5324,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
+@@ -5301,8 +5345,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
+@@ -5315,7 +5362,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
+@@ -5336,8 +5383,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
+@@ -5350,7 +5400,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
+@@ -5757,9 +5807,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; \
+@@ -5788,9 +5838,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; \
+@@ -5819,9 +5869,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; \
+@@ -5850,9 +5900,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; \
+@@ -5881,9 +5931,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; \
+@@ -5912,9 +5962,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; \
+@@ -5943,9 +5993,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; \
+@@ -5974,9 +6024,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; \
+@@ -6011,7 +6061,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
+ 
+ 
+@@ -6030,8 +6081,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
+@@ -6044,7 +6098,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/opcodes && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif opcodes-bootstrap
+ 
+@@ -6064,8 +6118,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
+@@ -6078,7 +6135,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
+@@ -6099,8 +6156,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
+@@ -6113,7 +6173,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
+@@ -6134,8 +6194,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
+@@ -6148,7 +6211,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
+@@ -6169,8 +6232,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
+@@ -6183,7 +6249,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
+@@ -6204,8 +6270,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
+@@ -6218,7 +6287,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
+@@ -6239,8 +6308,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
+@@ -6253,7 +6325,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
+@@ -6274,8 +6346,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
+@@ -6288,7 +6363,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
+@@ -6695,9 +6770,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; \
+@@ -6726,9 +6801,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; \
+@@ -6757,9 +6832,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; \
+@@ -6788,9 +6863,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; \
+@@ -6819,9 +6894,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; \
+@@ -6850,9 +6925,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; \
+@@ -6881,9 +6956,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; \
+@@ -6912,9 +6987,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; \
+@@ -6949,7 +7024,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
+ 
+ 
+@@ -6968,8 +7044,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
+@@ -6982,7 +7061,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/binutils && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif binutils-bootstrap
+ 
+@@ -7002,8 +7081,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
+@@ -7016,7 +7098,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
+@@ -7037,8 +7119,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
+@@ -7051,7 +7136,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
+@@ -7072,8 +7157,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
+@@ -7086,7 +7174,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
+@@ -7107,8 +7195,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
+@@ -7121,7 +7212,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
+@@ -7142,8 +7233,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
+@@ -7156,7 +7250,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
+@@ -7177,8 +7271,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
+@@ -7191,7 +7288,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
+@@ -7212,8 +7309,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
+@@ -7226,7 +7326,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
+@@ -7640,7 +7740,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
+ 
+ 
+@@ -8067,7 +8168,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
+ 
+ 
+@@ -8494,7 +8596,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
+ 
+ 
+@@ -8918,7 +9021,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
+ 
+ 
+@@ -9342,7 +9446,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
+ 
+ 
+@@ -9766,7 +9871,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
+ 
+ 
+@@ -10184,7 +10290,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
+ 
+ 
+@@ -10608,7 +10715,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
+ 
+ 
+@@ -11035,7 +11143,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
+ 
+ 
+@@ -11459,7 +11568,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
+ 
+ 
+@@ -11883,7 +11993,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
+ 
+ 
+@@ -12307,7 +12418,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
+ 
+ 
+@@ -12715,7 +12827,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
+ 
+ 
+@@ -13135,9 +13248,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; \
+@@ -13166,9 +13279,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; \
+@@ -13197,9 +13310,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; \
+@@ -13228,9 +13341,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; \
+@@ -13259,9 +13372,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; \
+@@ -13290,9 +13403,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; \
+@@ -13321,9 +13434,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; \
+@@ -13352,9 +13465,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; \
+@@ -13389,7 +13502,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
+ 
+ 
+@@ -13408,8 +13522,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
+@@ -13422,7 +13539,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/gas && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif gas-bootstrap
+ 
+@@ -13442,8 +13559,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
+@@ -13456,7 +13576,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
+@@ -13477,8 +13597,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
+@@ -13491,7 +13614,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
+@@ -13512,8 +13635,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
+@@ -13526,7 +13652,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
+@@ -13547,8 +13673,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
+@@ -13561,7 +13690,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
+@@ -13582,8 +13711,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
+@@ -13596,7 +13728,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
+@@ -13617,8 +13749,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
+@@ -13631,7 +13766,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
+@@ -13652,8 +13787,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
+@@ -13666,7 +13804,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
+@@ -14073,9 +14211,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; \
+@@ -14104,9 +14242,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; \
+@@ -14135,9 +14273,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; \
+@@ -14166,9 +14304,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; \
+@@ -14197,9 +14335,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; \
+@@ -14228,9 +14366,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; \
+@@ -14259,9 +14397,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; \
+@@ -14290,9 +14428,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; \
+@@ -14327,7 +14465,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
+ 
+ 
+@@ -14346,8 +14485,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
+@@ -14360,7 +14502,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/gcc && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		$(EXTRA_GCC_FLAGS) clean
+ @endif gcc-bootstrap
+ 
+@@ -14380,8 +14522,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
+@@ -14394,7 +14539,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
+@@ -14415,8 +14560,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
+@@ -14429,7 +14577,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
+@@ -14450,8 +14598,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
+@@ -14464,7 +14615,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
+@@ -14485,8 +14636,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
+@@ -14499,7 +14653,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
+@@ -14520,8 +14674,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
+@@ -14534,7 +14691,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
+@@ -14555,8 +14712,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
+@@ -14569,7 +14729,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
+@@ -14590,8 +14750,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
+@@ -14604,7 +14767,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
+@@ -15018,7 +15181,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
+ 
+ 
+@@ -15442,7 +15606,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
+ 
+ 
+@@ -15859,9 +16024,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; \
+@@ -15890,9 +16055,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; \
+@@ -15921,9 +16086,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; \
+@@ -15952,9 +16117,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; \
+@@ -15983,9 +16148,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; \
+@@ -16014,9 +16179,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; \
+@@ -16045,9 +16210,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; \
+@@ -16076,9 +16241,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; \
+@@ -16113,7 +16278,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
+ 
+ 
+@@ -16132,8 +16298,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
+@@ -16146,7 +16315,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/gmp && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif gmp-bootstrap
+ 
+@@ -16166,8 +16335,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
+@@ -16180,7 +16352,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
+@@ -16201,8 +16373,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
+@@ -16215,7 +16390,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
+@@ -16236,8 +16411,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
+@@ -16250,7 +16428,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
+@@ -16271,8 +16449,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
+@@ -16285,7 +16466,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
+@@ -16306,8 +16487,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
+@@ -16320,7 +16504,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
+@@ -16341,8 +16525,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
+@@ -16355,7 +16542,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
+@@ -16376,8 +16563,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
+@@ -16390,7 +16580,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
+@@ -16791,9 +16981,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; \
+@@ -16822,9 +17012,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; \
+@@ -16853,9 +17043,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; \
+@@ -16884,9 +17074,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; \
+@@ -16915,9 +17105,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; \
+@@ -16946,9 +17136,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; \
+@@ -16977,9 +17167,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; \
+@@ -17008,9 +17198,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; \
+@@ -17045,7 +17235,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
+ 
+ 
+@@ -17064,8 +17255,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
+@@ -17078,7 +17272,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/mpfr && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif mpfr-bootstrap
+ 
+@@ -17098,8 +17292,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
+@@ -17112,7 +17309,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
+@@ -17133,8 +17330,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
+@@ -17147,7 +17347,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
+@@ -17168,8 +17368,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
+@@ -17182,7 +17385,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
+@@ -17203,8 +17406,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
+@@ -17217,7 +17423,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
+@@ -17238,8 +17444,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
+@@ -17252,7 +17461,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
+@@ -17273,8 +17482,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
+@@ -17287,7 +17499,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
+@@ -17308,8 +17520,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
+@@ -17322,7 +17537,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
+@@ -17730,7 +17945,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
+ 
+ 
+@@ -18154,7 +18370,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
+ 
+ 
+@@ -18578,7 +18795,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
+ 
+ 
+@@ -19002,7 +19220,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
+ 
+ 
+@@ -19426,7 +19645,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
+ 
+ 
+@@ -19843,9 +20063,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; \
+@@ -19874,9 +20094,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; \
+@@ -19905,9 +20125,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; \
+@@ -19936,9 +20156,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; \
+@@ -19967,9 +20187,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; \
+@@ -19998,9 +20218,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; \
+@@ -20029,9 +20249,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; \
+@@ -20060,9 +20280,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; \
+@@ -20097,7 +20317,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
+ 
+ 
+@@ -20116,8 +20337,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
+@@ -20130,7 +20354,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/intl && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif intl-bootstrap
+ 
+@@ -20150,8 +20374,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
+@@ -20164,7 +20391,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
+@@ -20185,8 +20412,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
+@@ -20199,7 +20429,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
+@@ -20220,8 +20450,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
+@@ -20234,7 +20467,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
+@@ -20255,8 +20488,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
+@@ -20269,7 +20505,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
+@@ -20290,8 +20526,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
+@@ -20304,7 +20543,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
+@@ -20325,8 +20564,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
+@@ -20339,7 +20581,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
+@@ -20360,8 +20602,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
+@@ -20374,7 +20619,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
+@@ -20788,7 +21033,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
+ 
+ 
+@@ -21197,7 +21443,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
+ 
+ 
+@@ -21614,9 +21861,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; \
+@@ -21645,9 +21892,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; \
+@@ -21676,9 +21923,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; \
+@@ -21707,9 +21954,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; \
+@@ -21738,9 +21985,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; \
+@@ -21769,9 +22016,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; \
+@@ -21800,9 +22047,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; \
+@@ -21831,9 +22078,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; \
+@@ -21868,7 +22115,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
+ 
+ 
+@@ -21887,8 +22135,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
+@@ -21901,7 +22152,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/ld && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif ld-bootstrap
+ 
+@@ -21921,8 +22172,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
+@@ -21935,7 +22189,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
+@@ -21956,8 +22210,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
+@@ -21970,7 +22227,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
+@@ -21991,8 +22248,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
+@@ -22005,7 +22265,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
+@@ -22026,8 +22286,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
+@@ -22040,7 +22303,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
+@@ -22061,8 +22324,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
+@@ -22075,7 +22341,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
+@@ -22096,8 +22362,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
+@@ -22110,7 +22379,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
+@@ -22131,8 +22400,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
+@@ -22145,7 +22417,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
+@@ -22552,9 +22824,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; \
+@@ -22583,9 +22855,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; \
+@@ -22614,9 +22886,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; \
+@@ -22645,9 +22917,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; \
+@@ -22676,9 +22948,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; \
+@@ -22707,9 +22979,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; \
+@@ -22738,9 +23010,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; \
+@@ -22769,9 +23041,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; \
+@@ -22806,7 +23078,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
+ 
+ 
+@@ -22825,8 +23098,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
+@@ -22839,7 +23115,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/libcpp && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif libcpp-bootstrap
+ 
+@@ -22859,8 +23135,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
+@@ -22873,7 +23152,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
+@@ -22894,8 +23173,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
+@@ -22908,7 +23190,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
+@@ -22929,8 +23211,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
+@@ -22943,7 +23228,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
+@@ -22964,8 +23249,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
+@@ -22978,7 +23266,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
+@@ -22999,8 +23287,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
+@@ -23013,7 +23304,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
+@@ -23034,8 +23325,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
+@@ -23048,7 +23342,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
+@@ -23069,8 +23363,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
+@@ -23083,7 +23380,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
+@@ -23490,9 +23787,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; \
+@@ -23521,9 +23818,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; \
+@@ -23552,9 +23849,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; \
+@@ -23583,9 +23880,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; \
+@@ -23614,9 +23911,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; \
+@@ -23645,9 +23942,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; \
+@@ -23676,9 +23973,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; \
+@@ -23707,9 +24004,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; \
+@@ -23744,7 +24041,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
+ 
+ 
+@@ -23763,8 +24061,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
+@@ -23777,7 +24078,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/libdecnumber && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif libdecnumber-bootstrap
+ 
+@@ -23797,8 +24098,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
+@@ -23811,7 +24115,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
+@@ -23832,8 +24136,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
+@@ -23846,7 +24153,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
+@@ -23867,8 +24174,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
+@@ -23881,7 +24191,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
+@@ -23902,8 +24212,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
+@@ -23916,7 +24229,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
+@@ -23937,8 +24250,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
+@@ -23951,7 +24267,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
+@@ -23972,8 +24288,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
+@@ -23986,7 +24305,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
+@@ -24007,8 +24326,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
+@@ -24021,7 +24343,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
+@@ -24435,7 +24757,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
+ 
+ 
+@@ -24852,9 +25175,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; \
+@@ -24883,9 +25206,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; \
+@@ -24914,9 +25237,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; \
+@@ -24945,9 +25268,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; \
+@@ -24976,9 +25299,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; \
+@@ -25007,9 +25330,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; \
+@@ -25038,9 +25361,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; \
+@@ -25069,9 +25392,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; \
+@@ -25106,7 +25429,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
+ 
+ 
+@@ -25125,8 +25449,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
+@@ -25139,7 +25466,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/libiberty && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif libiberty-bootstrap
+ 
+@@ -25159,8 +25486,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
+@@ -25173,7 +25503,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
+@@ -25194,8 +25524,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
+@@ -25208,7 +25541,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
+@@ -25229,8 +25562,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
+@@ -25243,7 +25579,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
+@@ -25264,8 +25600,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
+@@ -25278,7 +25617,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
+@@ -25299,8 +25638,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
+@@ -25313,7 +25655,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
+@@ -25334,8 +25676,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
+@@ -25348,7 +25693,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
+@@ -25369,8 +25714,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
+@@ -25383,7 +25731,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
+@@ -25797,7 +26145,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
+ 
+ 
+@@ -26221,7 +26570,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
+ 
+ 
+@@ -26645,7 +26995,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
+ 
+ 
+@@ -27069,7 +27420,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
+ 
+ 
+@@ -27487,7 +27839,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
+ 
+ 
+@@ -27911,7 +28264,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
+ 
+ 
+@@ -28335,7 +28689,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
+ 
+ 
+@@ -28759,7 +29114,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
+ 
+ 
+@@ -29183,7 +29539,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
+ 
+ 
+@@ -29607,7 +29964,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
+ 
+ 
+@@ -30019,7 +30377,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
+ 
+ 
+@@ -30443,7 +30802,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
+ 
+ 
+@@ -30867,7 +31227,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
+ 
+ 
+@@ -31291,7 +31652,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
+ 
+ 
+@@ -31715,7 +32077,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
+ 
+ 
+@@ -32139,7 +32502,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
+ 
+ 
+@@ -32563,7 +32927,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
+ 
+ 
+@@ -32987,7 +33352,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
+ 
+ 
+@@ -33405,7 +33771,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
+ 
+ 
+@@ -33829,7 +34196,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
+ 
+ 
+@@ -34253,7 +34621,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
+ 
+ 
+@@ -34677,7 +35046,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
+ 
+ 
+@@ -35101,7 +35471,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
+ 
+ 
+@@ -35521,9 +35892,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; \
+@@ -35552,9 +35923,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; \
+@@ -35583,9 +35954,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; \
+@@ -35614,9 +35985,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; \
+@@ -35645,9 +36016,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; \
+@@ -35676,9 +36047,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; \
+@@ -35707,9 +36078,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; \
+@@ -35738,9 +36109,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; \
+@@ -35775,7 +36146,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
+ 
+ 
+@@ -35794,8 +36166,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
+@@ -35808,7 +36183,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/zlib && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif zlib-bootstrap
+ 
+@@ -35828,8 +36203,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
+@@ -35842,7 +36220,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
+@@ -35863,8 +36241,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
+@@ -35877,7 +36258,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
+@@ -35898,8 +36279,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
+@@ -35912,7 +36296,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
+@@ -35933,8 +36317,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
+@@ -35947,7 +36334,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
+@@ -35968,8 +36355,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
+@@ -35982,7 +36372,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
+@@ -36003,8 +36393,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
+@@ -36017,7 +36410,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
+@@ -36038,8 +36431,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
+@@ -36052,7 +36448,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
+@@ -36454,7 +36850,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
+ 
+ 
+@@ -36878,7 +37275,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
+ 
+ 
+@@ -37302,7 +37700,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
+ 
+ 
+@@ -37726,7 +38125,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
+ 
+ 
+@@ -38150,7 +38550,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
+ 
+ 
+@@ -38508,7 +38909,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
+ 
+ 
+@@ -38926,7 +39328,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
+ 
+ 
+@@ -39371,7 +39774,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
+ 
+ 
+@@ -39812,7 +40216,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
+ 
+ 
+@@ -40253,7 +40658,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
+ 
+ 
+@@ -40694,7 +41100,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
+ 
+ 
+@@ -41140,9 +41547,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; \
+@@ -41183,9 +41590,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; \
+@@ -41226,9 +41633,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; \
+@@ -41269,9 +41676,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; \
+@@ -41312,9 +41719,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; \
+@@ -41355,9 +41762,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; \
+@@ -41398,9 +41805,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; \
+@@ -41441,9 +41848,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; \
+@@ -41478,7 +41885,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
+ 
+ 
+@@ -41497,8 +41905,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
+@@ -41511,7 +41922,7 @@
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(TARGET_SUBDIR)/libgcc && \
+-	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+ 		 clean
+ @endif target-libgcc-bootstrap
+ 
+@@ -41531,8 +41942,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
+@@ -41545,7 +41959,7 @@
+ 	  $(MAKE) stage2-start; \
+ 	fi; \
+ 	cd $(TARGET_SUBDIR)/libgcc && \
+-	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+ 		  \
+ 		 clean
+ @endif target-libgcc-bootstrap
+@@ -41566,8 +41980,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
+@@ -41580,7 +41997,7 @@
+ 	  $(MAKE) stageb2g0-start; \
+ 	fi; \
+ 	cd $(TARGET_SUBDIR)/libgcc && \
+-	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+ 		  \
+ 		 clean
+ @endif target-libgcc-bootstrap
+@@ -41601,8 +42018,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
+@@ -41615,7 +42035,7 @@
+ 	  $(MAKE) stage3-start; \
+ 	fi; \
+ 	cd $(TARGET_SUBDIR)/libgcc && \
+-	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+ 		  \
+ 		 clean
+ @endif target-libgcc-bootstrap
+@@ -41636,8 +42056,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
+@@ -41650,7 +42073,7 @@
+ 	  $(MAKE) stageb3g2-start; \
+ 	fi; \
+ 	cd $(TARGET_SUBDIR)/libgcc && \
+-	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+ 		  \
+ 		 clean
+ @endif target-libgcc-bootstrap
+@@ -41671,8 +42094,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
+@@ -41685,7 +42111,7 @@
+ 	  $(MAKE) stage4-start; \
+ 	fi; \
+ 	cd $(TARGET_SUBDIR)/libgcc && \
+-	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+ 		  \
+ 		 clean
+ @endif target-libgcc-bootstrap
+@@ -41706,8 +42132,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
+@@ -41720,7 +42149,7 @@
+ 	  $(MAKE) stageprofile-start; \
+ 	fi; \
+ 	cd $(TARGET_SUBDIR)/libgcc && \
+-	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+ 		  \
+ 		 clean
+ @endif target-libgcc-bootstrap
+@@ -41741,8 +42170,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
+@@ -41755,7 +42187,7 @@
+ 	  $(MAKE) stagefeedback-start; \
+ 	fi; \
+ 	cd $(TARGET_SUBDIR)/libgcc && \
+-	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+ 		  \
+ 		 clean
+ @endif target-libgcc-bootstrap
+@@ -42194,7 +42626,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
+ 
+ 
+@@ -42635,7 +43068,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
+ 
+ 
+@@ -43076,7 +43510,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
+ 
+ 
+@@ -43452,7 +43887,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
+ 
+ 
+@@ -43893,7 +44329,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
+ 
+ 
+@@ -44329,7 +44766,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
+ 
+ 
+@@ -44770,7 +45208,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
+ 
+ 
+@@ -45211,7 +45650,8 @@
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(NORMAL_TARGET_EXPORTS) \
+ 	(cd $(TARGET_SUBDIR)/examples && \
+-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-examples))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
++		$(TARGET-target-examples))
+ @endif target-examples
+ 
+ 
+@@ -45642,7 +46082,8 @@
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(NORMAL_TARGET_EXPORTS) \
+ 	(cd $(TARGET_SUBDIR)/libffi && \
+-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libffi))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
++		$(TARGET-target-libffi))
+ @endif target-libffi
+ 
+ 
+@@ -46083,7 +46524,8 @@
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(RAW_CXX_TARGET_EXPORTS) \
+ 	(cd $(TARGET_SUBDIR)/libjava && \
+-	  $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  $(TARGET-target-libjava))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
++		$(TARGET-target-libjava))
+ @endif target-libjava
+ 
+ 
+@@ -46524,7 +46966,8 @@
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(NORMAL_TARGET_EXPORTS) \
+ 	(cd $(TARGET_SUBDIR)/zlib && \
+-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-zlib))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
++		$(TARGET-target-zlib))
+ @endif target-zlib
+ 
+ 
+@@ -46965,7 +47408,8 @@
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(NORMAL_TARGET_EXPORTS) \
+ 	(cd $(TARGET_SUBDIR)/boehm-gc && \
+-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-boehm-gc))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
++		$(TARGET-target-boehm-gc))
+ @endif target-boehm-gc
+ 
+ 
+@@ -47406,7 +47850,8 @@
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(NORMAL_TARGET_EXPORTS) \
+ 	(cd $(TARGET_SUBDIR)/qthreads && \
+-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-qthreads))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
++		$(TARGET-target-qthreads))
+ @endif target-qthreads
+ 
+ 
+@@ -47847,7 +48292,8 @@
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(NORMAL_TARGET_EXPORTS) \
+ 	(cd $(TARGET_SUBDIR)/rda && \
+-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-rda))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
++		$(TARGET-target-rda))
+ @endif target-rda
+ 
+ 
+@@ -48288,7 +48734,8 @@
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(NORMAL_TARGET_EXPORTS) \
+ 	(cd $(TARGET_SUBDIR)/libada && \
+-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libada))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
++		$(TARGET-target-libada))
+ @endif target-libada
+ 
+ 
+@@ -48729,7 +49176,8 @@
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(NORMAL_TARGET_EXPORTS) \
+ 	(cd $(TARGET_SUBDIR)/libgomp && \
+-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgomp))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
++		$(TARGET-target-libgomp))
+ @endif target-libgomp
+ 
+ 
+@@ -49362,7 +49810,7 @@
+ 
+ # Bubble a bug fix through all the stages up to stage 1.  They are
+ # remade, but not reconfigured.  The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stage1-bubble
+ stage1-bubble:: 
+ 	@r=`${PWD_COMMAND}`; export r; \
+@@ -49573,7 +50021,7 @@
+ 
+ # Bubble a bug fix through all the stages up to stage 2.  They are
+ # remade, but not reconfigured.  The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stage2-bubble
+ stage2-bubble:: stage1-bubble
+ 	@r=`${PWD_COMMAND}`; export r; \
+@@ -49805,7 +50253,7 @@
+ 
+ # Bubble a bug fix through all the stages up to stage b2g0.  They are
+ # remade, but not reconfigured.  The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stageb2g0-bubble
+ stageb2g0-bubble:: stage1-bubble
+ 	@r=`${PWD_COMMAND}`; export r; \
+@@ -50037,7 +50485,7 @@
+ 
+ # Bubble a bug fix through all the stages up to stage 3.  They are
+ # remade, but not reconfigured.  The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stage3-bubble
+ stage3-bubble:: stage2-bubble
+ 	@r=`${PWD_COMMAND}`; export r; \
+@@ -50323,7 +50771,7 @@
+ 
+ # Bubble a bug fix through all the stages up to stage b3g2.  They are
+ # remade, but not reconfigured.  The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stageb3g2-bubble
+ stageb3g2-bubble:: stageb2g0-bubble
+ 	@r=`${PWD_COMMAND}`; export r; \
+@@ -50609,7 +51057,7 @@
+ 
+ # Bubble a bug fix through all the stages up to stage 4.  They are
+ # remade, but not reconfigured.  The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stage4-bubble
+ stage4-bubble:: stage3-bubble
+ 	@r=`${PWD_COMMAND}`; export r; \
+@@ -50884,7 +51332,7 @@
+ 
+ # Bubble a bug fix through all the stages up to stage profile.  They are
+ # remade, but not reconfigured.  The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stageprofile-bubble
+ stageprofile-bubble:: stage1-bubble
+ 	@r=`${PWD_COMMAND}`; export r; \
+@@ -51095,7 +51543,7 @@
+ 
+ # Bubble a bug fix through all the stages up to stage feedback.  They are
+ # remade, but not reconfigured.  The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stagefeedback-bubble
+ stagefeedback-bubble:: stageprofile-bubble
+ 	@r=`${PWD_COMMAND}`; export r; \
+@@ -51178,10 +51626,10 @@
+ 	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ 
+ .PHONY: restrap
+-restrap:
++restrap::
+ 	@: $(MAKE); $(stage)
+ 	rm -rf stage1-$(TARGET_SUBDIR) stage2-* stageb2g0-* stage3-* stageb3g2-* stage4-* stageprofile-* stagefeedback-* 
+-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
++restrap:: all
+ @endif gcc-bootstrap
+ 
+ # --------------------------------------
+@@ -52007,7 +52455,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.2/libiberty/Makefile.in
+===================================================================
+--- gcc-4.3.2.orig/libiberty/Makefile.in	2007-07-24 23:26:45.000000000 -0700
++++ gcc-4.3.2/libiberty/Makefile.in	2008-08-28 18:18:37.000000000 -0700
+@@ -60,7 +60,7 @@
+ MAKEINFO = @MAKEINFO@
+ PERL = @PERL@
+ 
+-PICFLAG =
++PICFLAG = @PICFLAG@
+ 
+ MAKEOVERRIDES =
+ 
+@@ -143,10 +143,11 @@
+ 	 pex-unix.c pex-win32.c						\
+          physmem.c putenv.c						\
+ 	random.c regex.c rename.c rindex.c				\
+-	safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c spaces.c	\
+-	 splay-tree.c stpcpy.c stpncpy.c strcasecmp.c strchr.c strdup.c	\
+-	 strerror.c strncasecmp.c strncmp.c strrchr.c strsignal.c	\
+-	 strstr.c strtod.c strtol.c strtoul.c strndup.c	strverscmp.c	\
++	safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c	\
++	 spaces.c splay-tree.c stpcpy.c stpncpy.c strcasecmp.c		\
++	 strchr.c strdup.c strerror.c strncasecmp.c strncmp.c		\
++	 strrchr.c strsignal.c strstr.c strtod.c strtol.c strtoul.c	\
++	 strndup.c strverscmp.c						\
+ 	tmpnam.c							\
+ 	unlink-if-ordinary.c						\
+ 	vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c	\
+@@ -156,7 +157,8 @@
+ 
+ # These are always included in the library.  The first four are listed
+ # first and by compile time to optimize parallel builds.
+-REQUIRED_OFILES = ./regex.o ./cplus-dem.o ./cp-demangle.o ./md5.o	\
++REQUIRED_OFILES =							\
++	./regex.o ./cplus-dem.o ./cp-demangle.o ./md5.o			\
+ 	./alloca.o ./argv.o						\
+ 	./choose-temp.o ./concat.o ./cp-demint.o			\
+ 	./dyn-string.o							\
+@@ -473,13 +475,13 @@
+ config.status: $(srcdir)/configure
+ 	$(SHELL) ./config.status --recheck
+ 
+-# Depending on stamp-h makes sure that config.status has been re-run
++# Depending on config.h makes sure that config.status has been re-run
+ # if needed.  This prevents problems with parallel builds, in case
+ # subdirectories need to run config.status also.
+ all-subdir check-subdir installcheck-subdir info-subdir	\
+ install-info-subdir clean-info-subdir dvi-subdir pdf-subdir install-subdir	\
+ etags-subdir mostlyclean-subdir clean-subdir distclean-subdir \
+-maintainer-clean-subdir: stamp-h
++maintainer-clean-subdir: config.h
+ 	@subdirs='$(SUBDIRS)'; \
+ 	target=`echo $@ | sed -e 's/-subdir//'`; \
+ 	for dir in $$subdirs ; do \
+@@ -496,40 +498,41 @@
+ # The dependencies in the remainder of this file are automatically
+ # generated by "make maint-deps".  Manual edits will be lost.
+ 
+-./_doprnt.o: $(srcdir)/_doprnt.c stamp-h $(INCDIR)/ansidecl.h \
++./_doprnt.o: $(srcdir)/_doprnt.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/safe-ctype.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/_doprnt.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/_doprnt.c $(OUTPUT_OPTION)
+ 
+-./alloca.o: $(srcdir)/alloca.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
++./alloca.o: $(srcdir)/alloca.c config.h $(INCDIR)/ansidecl.h \
++	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/alloca.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/alloca.c $(OUTPUT_OPTION)
+ 
+-./argv.o: $(srcdir)/argv.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
++./argv.o: $(srcdir)/argv.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+ 	$(INCDIR)/safe-ctype.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/argv.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/argv.c $(OUTPUT_OPTION)
+ 
+-./asprintf.o: $(srcdir)/asprintf.c stamp-h $(INCDIR)/ansidecl.h \
++./asprintf.o: $(srcdir)/asprintf.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/asprintf.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/asprintf.c $(OUTPUT_OPTION)
+ 
+-./atexit.o: $(srcdir)/atexit.c stamp-h
++./atexit.o: $(srcdir)/atexit.c config.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/atexit.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/atexit.c $(OUTPUT_OPTION)
+ 
+-./basename.o: $(srcdir)/basename.c stamp-h $(INCDIR)/ansidecl.h \
++./basename.o: $(srcdir)/basename.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/basename.c -o pic/$@; \
+@@ -548,7 +551,7 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/bcopy.c $(OUTPUT_OPTION)
+ 
+-./bsearch.o: $(srcdir)/bsearch.c stamp-h $(INCDIR)/ansidecl.h
++./bsearch.o: $(srcdir)/bsearch.c config.h $(INCDIR)/ansidecl.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/bsearch.c -o pic/$@; \
+ 	else true; fi
+@@ -566,20 +569,21 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/calloc.c $(OUTPUT_OPTION)
+ 
+-./choose-temp.o: $(srcdir)/choose-temp.c stamp-h $(INCDIR)/ansidecl.h \
++./choose-temp.o: $(srcdir)/choose-temp.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/choose-temp.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/choose-temp.c $(OUTPUT_OPTION)
+ 
+-./clock.o: $(srcdir)/clock.c stamp-h
++./clock.o: $(srcdir)/clock.c config.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/clock.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/clock.c $(OUTPUT_OPTION)
+ 
+-./concat.o: $(srcdir)/concat.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
++./concat.o: $(srcdir)/concat.c config.h $(INCDIR)/ansidecl.h \
++	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/concat.c -o pic/$@; \
+ 	else true; fi
+@@ -591,7 +595,7 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/copysign.c $(OUTPUT_OPTION)
+ 
+-./cp-demangle.o: $(srcdir)/cp-demangle.c stamp-h $(INCDIR)/ansidecl.h \
++./cp-demangle.o: $(srcdir)/cp-demangle.c config.h $(INCDIR)/ansidecl.h \
+ 	$(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \
+ 	$(INCDIR)/dyn-string.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+@@ -599,7 +603,7 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/cp-demangle.c $(OUTPUT_OPTION)
+ 
+-./cp-demint.o: $(srcdir)/cp-demint.c stamp-h $(INCDIR)/ansidecl.h \
++./cp-demint.o: $(srcdir)/cp-demint.c config.h $(INCDIR)/ansidecl.h \
+ 	$(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+@@ -607,7 +611,7 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/cp-demint.c $(OUTPUT_OPTION)
+ 
+-./cplus-dem.o: $(srcdir)/cplus-dem.c stamp-h $(INCDIR)/ansidecl.h \
++./cplus-dem.o: $(srcdir)/cplus-dem.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
+ 	$(INCDIR)/safe-ctype.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+@@ -615,14 +619,14 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/cplus-dem.c $(OUTPUT_OPTION)
+ 
+-./dyn-string.o: $(srcdir)/dyn-string.c stamp-h $(INCDIR)/ansidecl.h \
++./dyn-string.o: $(srcdir)/dyn-string.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/dyn-string.h $(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/dyn-string.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/dyn-string.c $(OUTPUT_OPTION)
+ 
+-./fdmatch.o: $(srcdir)/fdmatch.c stamp-h $(INCDIR)/ansidecl.h \
++./fdmatch.o: $(srcdir)/fdmatch.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/fdmatch.c -o pic/$@; \
+@@ -635,93 +639,94 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/ffs.c $(OUTPUT_OPTION)
+ 
+-./fibheap.o: $(srcdir)/fibheap.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/fibheap.h \
+-	$(INCDIR)/libiberty.h
++./fibheap.o: $(srcdir)/fibheap.c config.h $(INCDIR)/ansidecl.h \
++	$(INCDIR)/fibheap.h $(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/fibheap.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION)
+ 
+-./filename_cmp.o: $(srcdir)/filename_cmp.c stamp-h $(INCDIR)/filenames.h \
++./filename_cmp.o: $(srcdir)/filename_cmp.c config.h $(INCDIR)/filenames.h \
+ 	$(INCDIR)/safe-ctype.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/filename_cmp.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/filename_cmp.c $(OUTPUT_OPTION)
+ 
+-./floatformat.o: $(srcdir)/floatformat.c stamp-h $(INCDIR)/ansidecl.h \
++./floatformat.o: $(srcdir)/floatformat.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/floatformat.h $(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/floatformat.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/floatformat.c $(OUTPUT_OPTION)
+ 
+-./fnmatch.o: $(srcdir)/fnmatch.c stamp-h $(INCDIR)/fnmatch.h \
++./fnmatch.o: $(srcdir)/fnmatch.c config.h $(INCDIR)/fnmatch.h \
+ 	$(INCDIR)/safe-ctype.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/fnmatch.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/fnmatch.c $(OUTPUT_OPTION)
+ 
+-./fopen_unlocked.o: $(srcdir)/fopen_unlocked.c stamp-h $(INCDIR)/ansidecl.h \
++./fopen_unlocked.o: $(srcdir)/fopen_unlocked.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/fopen_unlocked.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/fopen_unlocked.c $(OUTPUT_OPTION)
+ 
+-./getcwd.o: $(srcdir)/getcwd.c stamp-h
++./getcwd.o: $(srcdir)/getcwd.c config.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/getcwd.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/getcwd.c $(OUTPUT_OPTION)
+ 
+-./getopt.o: $(srcdir)/getopt.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/getopt.h
++./getopt.o: $(srcdir)/getopt.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/getopt.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/getopt.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/getopt.c $(OUTPUT_OPTION)
+ 
+-./getopt1.o: $(srcdir)/getopt1.c stamp-h $(INCDIR)/getopt.h
++./getopt1.o: $(srcdir)/getopt1.c config.h $(INCDIR)/getopt.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/getopt1.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/getopt1.c $(OUTPUT_OPTION)
+ 
+-./getpagesize.o: $(srcdir)/getpagesize.c stamp-h
++./getpagesize.o: $(srcdir)/getpagesize.c config.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/getpagesize.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/getpagesize.c $(OUTPUT_OPTION)
+ 
+-./getpwd.o: $(srcdir)/getpwd.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
++./getpwd.o: $(srcdir)/getpwd.c config.h $(INCDIR)/ansidecl.h \
++	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/getpwd.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/getpwd.c $(OUTPUT_OPTION)
+ 
+-./getruntime.o: $(srcdir)/getruntime.c stamp-h $(INCDIR)/ansidecl.h \
++./getruntime.o: $(srcdir)/getruntime.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/getruntime.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/getruntime.c $(OUTPUT_OPTION)
+ 
+-./gettimeofday.o: $(srcdir)/gettimeofday.c stamp-h $(INCDIR)/ansidecl.h \
++./gettimeofday.o: $(srcdir)/gettimeofday.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/gettimeofday.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/gettimeofday.c $(OUTPUT_OPTION)
+ 
+-./hashtab.o: $(srcdir)/hashtab.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/hashtab.h \
+-	$(INCDIR)/libiberty.h
++./hashtab.o: $(srcdir)/hashtab.c config.h $(INCDIR)/ansidecl.h \
++	$(INCDIR)/hashtab.h $(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/hashtab.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/hashtab.c $(OUTPUT_OPTION)
+ 
+-./hex.o: $(srcdir)/hex.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
++./hex.o: $(srcdir)/hex.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+ 	$(INCDIR)/safe-ctype.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/hex.c -o pic/$@; \
+@@ -740,7 +745,7 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/insque.c $(OUTPUT_OPTION)
+ 
+-./lbasename.o: $(srcdir)/lbasename.c stamp-h $(INCDIR)/ansidecl.h \
++./lbasename.o: $(srcdir)/lbasename.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/filenames.h $(INCDIR)/libiberty.h \
+ 	$(INCDIR)/safe-ctype.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+@@ -748,28 +753,28 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/lbasename.c $(OUTPUT_OPTION)
+ 
+-./lrealpath.o: $(srcdir)/lrealpath.c stamp-h $(INCDIR)/ansidecl.h \
++./lrealpath.o: $(srcdir)/lrealpath.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/lrealpath.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/lrealpath.c $(OUTPUT_OPTION)
+ 
+-./make-relative-prefix.o: $(srcdir)/make-relative-prefix.c stamp-h \
++./make-relative-prefix.o: $(srcdir)/make-relative-prefix.c config.h \
+ 	$(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/make-relative-prefix.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/make-relative-prefix.c $(OUTPUT_OPTION)
+ 
+-./make-temp-file.o: $(srcdir)/make-temp-file.c stamp-h $(INCDIR)/ansidecl.h \
++./make-temp-file.o: $(srcdir)/make-temp-file.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/make-temp-file.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/make-temp-file.c $(OUTPUT_OPTION)
+ 
+-./md5.o: $(srcdir)/md5.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/md5.h
++./md5.o: $(srcdir)/md5.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/md5.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/md5.c -o pic/$@; \
+ 	else true; fi
+@@ -811,7 +816,7 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/memset.c $(OUTPUT_OPTION)
+ 
+-./mkstemps.o: $(srcdir)/mkstemps.c stamp-h $(INCDIR)/ansidecl.h
++./mkstemps.o: $(srcdir)/mkstemps.c config.h $(INCDIR)/ansidecl.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/mkstemps.c -o pic/$@; \
+ 	else true; fi
+@@ -823,41 +828,41 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/msdos.c $(OUTPUT_OPTION)
+ 
+-./objalloc.o: $(srcdir)/objalloc.c stamp-h $(INCDIR)/ansidecl.h \
++./objalloc.o: $(srcdir)/objalloc.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/objalloc.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/objalloc.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/objalloc.c $(OUTPUT_OPTION)
+ 
+-./obstack.o: $(srcdir)/obstack.c stamp-h $(INCDIR)/obstack.h
++./obstack.o: $(srcdir)/obstack.c config.h $(INCDIR)/obstack.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/obstack.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/obstack.c $(OUTPUT_OPTION)
+ 
+-./partition.o: $(srcdir)/partition.c stamp-h $(INCDIR)/ansidecl.h \
++./partition.o: $(srcdir)/partition.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h $(INCDIR)/partition.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/partition.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/partition.c $(OUTPUT_OPTION)
+ 
+-./pex-common.o: $(srcdir)/pex-common.c stamp-h $(INCDIR)/ansidecl.h \
++./pex-common.o: $(srcdir)/pex-common.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h $(srcdir)/pex-common.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-common.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/pex-common.c $(OUTPUT_OPTION)
+ 
+-./pex-djgpp.o: $(srcdir)/pex-djgpp.c stamp-h $(INCDIR)/ansidecl.h \
++./pex-djgpp.o: $(srcdir)/pex-djgpp.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h $(srcdir)/pex-common.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-djgpp.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION)
+ 
+-./pex-msdos.o: $(srcdir)/pex-msdos.c stamp-h $(INCDIR)/ansidecl.h \
++./pex-msdos.o: $(srcdir)/pex-msdos.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h $(srcdir)/pex-common.h \
+ 	$(INCDIR)/safe-ctype.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+@@ -865,42 +870,42 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/pex-msdos.c $(OUTPUT_OPTION)
+ 
+-./pex-one.o: $(srcdir)/pex-one.c stamp-h $(INCDIR)/ansidecl.h \
++./pex-one.o: $(srcdir)/pex-one.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-one.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/pex-one.c $(OUTPUT_OPTION)
+ 
+-./pex-unix.o: $(srcdir)/pex-unix.c stamp-h $(INCDIR)/ansidecl.h \
++./pex-unix.o: $(srcdir)/pex-unix.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h $(srcdir)/pex-common.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-unix.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/pex-unix.c $(OUTPUT_OPTION)
+ 
+-./pex-win32.o: $(srcdir)/pex-win32.c stamp-h $(INCDIR)/ansidecl.h \
++./pex-win32.o: $(srcdir)/pex-win32.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h $(srcdir)/pex-common.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-win32.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/pex-win32.c $(OUTPUT_OPTION)
+ 
+-./pexecute.o: $(srcdir)/pexecute.c stamp-h $(INCDIR)/ansidecl.h \
++./pexecute.o: $(srcdir)/pexecute.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pexecute.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/pexecute.c $(OUTPUT_OPTION)
+ 
+-./physmem.o: $(srcdir)/physmem.c stamp-h $(INCDIR)/ansidecl.h \
++./physmem.o: $(srcdir)/physmem.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/physmem.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/physmem.c $(OUTPUT_OPTION)
+ 
+-./putenv.o: $(srcdir)/putenv.c stamp-h $(INCDIR)/ansidecl.h
++./putenv.o: $(srcdir)/putenv.c config.h $(INCDIR)/ansidecl.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/putenv.c -o pic/$@; \
+ 	else true; fi
+@@ -912,14 +917,14 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/random.c $(OUTPUT_OPTION)
+ 
+-./regex.o: $(srcdir)/regex.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/xregex.h \
++./regex.o: $(srcdir)/regex.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/xregex.h \
+ 	$(INCDIR)/xregex2.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/regex.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/regex.c $(OUTPUT_OPTION)
+ 
+-./rename.o: $(srcdir)/rename.c stamp-h $(INCDIR)/ansidecl.h
++./rename.o: $(srcdir)/rename.c config.h $(INCDIR)/ansidecl.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/rename.c -o pic/$@; \
+ 	else true; fi
+@@ -938,7 +943,7 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/safe-ctype.c $(OUTPUT_OPTION)
+ 
+-./setenv.o: $(srcdir)/setenv.c stamp-h $(INCDIR)/ansidecl.h
++./setenv.o: $(srcdir)/setenv.c config.h $(INCDIR)/ansidecl.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/setenv.c -o pic/$@; \
+ 	else true; fi
+@@ -956,20 +961,21 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/snprintf.c $(OUTPUT_OPTION)
+ 
+-./sort.o: $(srcdir)/sort.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
++./sort.o: $(srcdir)/sort.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+ 	$(INCDIR)/sort.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/sort.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/sort.c $(OUTPUT_OPTION)
+ 
+-./spaces.o: $(srcdir)/spaces.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
++./spaces.o: $(srcdir)/spaces.c config.h $(INCDIR)/ansidecl.h \
++	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/spaces.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/spaces.c $(OUTPUT_OPTION)
+ 
+-./splay-tree.o: $(srcdir)/splay-tree.c stamp-h $(INCDIR)/ansidecl.h \
++./splay-tree.o: $(srcdir)/splay-tree.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h $(INCDIR)/splay-tree.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/splay-tree.c -o pic/$@; \
+@@ -1006,7 +1012,7 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/strdup.c $(OUTPUT_OPTION)
+ 
+-./strerror.o: $(srcdir)/strerror.c stamp-h $(INCDIR)/ansidecl.h \
++./strerror.o: $(srcdir)/strerror.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strerror.c -o pic/$@; \
+@@ -1037,7 +1043,7 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/strrchr.c $(OUTPUT_OPTION)
+ 
+-./strsignal.o: $(srcdir)/strsignal.c stamp-h $(INCDIR)/ansidecl.h \
++./strsignal.o: $(srcdir)/strsignal.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strsignal.c -o pic/$@; \
+@@ -1056,13 +1062,13 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/strtod.c $(OUTPUT_OPTION)
+ 
+-./strtol.o: $(srcdir)/strtol.c stamp-h $(INCDIR)/safe-ctype.h
++./strtol.o: $(srcdir)/strtol.c config.h $(INCDIR)/safe-ctype.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strtol.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/strtol.c $(OUTPUT_OPTION)
+ 
+-./strtoul.o: $(srcdir)/strtoul.c stamp-h $(INCDIR)/ansidecl.h \
++./strtoul.o: $(srcdir)/strtoul.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/safe-ctype.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strtoul.c -o pic/$@; \
+@@ -1082,14 +1088,14 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/tmpnam.c $(OUTPUT_OPTION)
+ 
+-./unlink-if-ordinary.o: $(srcdir)/unlink-if-ordinary.c stamp-h \
++./unlink-if-ordinary.o: $(srcdir)/unlink-if-ordinary.c config.h \
+ 	$(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/unlink-if-ordinary.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/unlink-if-ordinary.c $(OUTPUT_OPTION)
+ 
+-./vasprintf.o: $(srcdir)/vasprintf.c stamp-h $(INCDIR)/ansidecl.h \
++./vasprintf.o: $(srcdir)/vasprintf.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/vasprintf.c -o pic/$@; \
+@@ -1114,7 +1120,7 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/vprintf.c $(OUTPUT_OPTION)
+ 
+-./vsnprintf.o: $(srcdir)/vsnprintf.c stamp-h $(INCDIR)/ansidecl.h \
++./vsnprintf.o: $(srcdir)/vsnprintf.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/vsnprintf.c -o pic/$@; \
+@@ -1127,54 +1133,54 @@
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/vsprintf.c $(OUTPUT_OPTION)
+ 
+-./waitpid.o: $(srcdir)/waitpid.c stamp-h $(INCDIR)/ansidecl.h
++./waitpid.o: $(srcdir)/waitpid.c config.h $(INCDIR)/ansidecl.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/waitpid.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/waitpid.c $(OUTPUT_OPTION)
+ 
+-./xatexit.o: $(srcdir)/xatexit.c stamp-h $(INCDIR)/ansidecl.h \
++./xatexit.o: $(srcdir)/xatexit.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xatexit.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/xatexit.c $(OUTPUT_OPTION)
+ 
+-./xexit.o: $(srcdir)/xexit.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
++./xexit.o: $(srcdir)/xexit.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xexit.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/xexit.c $(OUTPUT_OPTION)
+ 
+-./xmalloc.o: $(srcdir)/xmalloc.c stamp-h $(INCDIR)/ansidecl.h \
++./xmalloc.o: $(srcdir)/xmalloc.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xmalloc.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/xmalloc.c $(OUTPUT_OPTION)
+ 
+-./xmemdup.o: $(srcdir)/xmemdup.c stamp-h $(INCDIR)/ansidecl.h \
++./xmemdup.o: $(srcdir)/xmemdup.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xmemdup.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/xmemdup.c $(OUTPUT_OPTION)
+ 
+-./xstrdup.o: $(srcdir)/xstrdup.c stamp-h $(INCDIR)/ansidecl.h \
++./xstrdup.o: $(srcdir)/xstrdup.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrdup.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/xstrdup.c $(OUTPUT_OPTION)
+ 
+-./xstrerror.o: $(srcdir)/xstrerror.c stamp-h $(INCDIR)/ansidecl.h \
++./xstrerror.o: $(srcdir)/xstrerror.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrerror.c -o pic/$@; \
+ 	else true; fi
+ 	$(COMPILE.c) $(srcdir)/xstrerror.c $(OUTPUT_OPTION)
+ 
+-./xstrndup.o: $(srcdir)/xstrndup.c stamp-h $(INCDIR)/ansidecl.h \
++./xstrndup.o: $(srcdir)/xstrndup.c config.h $(INCDIR)/ansidecl.h \
+ 	$(INCDIR)/libiberty.h
+ 	if [ x"$(PICFLAG)" != x ]; then \
+ 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrndup.c -o pic/$@; \
+Index: gcc-4.3.2/libiberty/configure
+===================================================================
+--- gcc-4.3.2.orig/libiberty/configure	2007-07-17 10:52:28.000000000 -0700
++++ gcc-4.3.2/libiberty/configure	2008-08-28 18:18:37.000000000 -0700
+@@ -309,7 +309,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libiberty_topdir MAINT NOTMAINT MAKEINFO BUILD_INFO PERL HAVE_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os AR ac_ct_AR RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP ac_libiberty_warn_cflags NO_MINUS_C_MINUS_O OUTPUT_OPTION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA EGREP LIBOBJS CHECK target_header_dir pexecute INSTALL_DEST datarootdir docdir htmldir LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libiberty_topdir MAINT NOTMAINT MAKEINFO BUILD_INFO PERL HAVE_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os AR ac_ct_AR RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP ac_libiberty_warn_cflags NO_MINUS_C_MINUS_O OUTPUT_OPTION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PICFLAG EGREP LIBOBJS CHECK target_header_dir pexecute INSTALL_DEST datarootdir docdir htmldir LTLIBOBJS'
+ ac_subst_files='host_makefile_frag'
+ 
+ # Initialize some variables set by options.
+@@ -3699,9 +3699,7 @@
+ esac
+ 
+ if [ -n "${frag}" ]; then
+-  frags=${libiberty_topdir}/libiberty/config/$frag
+-else
+-  frags=
++  frag=${libiberty_topdir}/libiberty/config/$frag
+ fi
+ 
+ # If they didn't specify --enable-shared, don't generate shared libs.
+@@ -3712,34 +3710,35 @@
+   *) shared=yes ;;
+ esac
+ if [ "${shared}" = "yes" ]; then
+-  frag=
+   case "${host}" in
+     *-*-cygwin*)	;;
+-    alpha*-*-linux*)	frag=mh-elfalphapic ;;
+-    arm*-*-*)		frag=mh-armpic ;;
+-    hppa*-*-*)		frag=mh-papic ;;
++    alpha*-*-linux*)	PICFLAG=-fPIC ;;
++    arm*-*-*)		PICFLAG=-fPIC ;;
++    hppa*-*-*)		PICFLAG=-fPIC ;;
++    i370-*-*)		PICFLAG=-fPIC ;;
++    ia64-*-*)		PICFLAG=-fpic ;;
+     i[34567]86-*-* | x86_64-*-*)
+-			frag=mh-x86pic ;;
++			PICFLAG=-fpic ;;
++    m68k-*-*)		PICFLAG=-fpic ;;
++    mips*-*-linux)	PICFLAG=-fPIC ;;
+     powerpc*-*-aix*)	;;
+-    powerpc*-*-*)	frag=mh-ppcpic ;;
+-    sparc*-*-*)		frag=mh-sparcpic ;;
+-    s390*-*-*)		frag=mh-s390pic ;;
+-    *)			frag=mh-${host_cpu}pic ;;
++    powerpc*-*-*)	PICFLAG=-fPIC ;;
++    sparc*-*-*)		case "${CFLAGS}" in
++			  *-fpic* ) PICFLAG=-fpic ;;
++			  * ) PICFLAG=-fPIC ;;
++			esac ;;
++    s390*-*-*)		PICFLAG=-fpic ;;
+   esac
+-  if [ -n "${frag}" ]; then
+-    frags="${frags} ${libiberty_topdir}/config/${frag}"
+-  fi
+ fi
+ 
++
+ echo "# Warning: this fragment is automatically generated" > temp-frag
+ 
+-for frag in ${frags}; do
+-  if [ -f ${frag} ]; then
+-    echo "Appending ${frag} to xhost-mkfrag"
+-    echo "# Following fragment copied from ${frag}" >> temp-frag
+-    cat ${frag} >> temp-frag
+-  fi
+-done
++if [ -n "${frag}" ] && [ -f "${frag}" ]; then
++  echo "Appending ${frag} to xhost-mkfrag"
++  echo "# Following fragment copied from ${frag}" >> temp-frag
++  cat ${frag} >> temp-frag
++fi
+ 
+ # record if we want to build shared libs.
+ if [ "${shared}" = "yes" ]; then
+@@ -9671,6 +9670,7 @@
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
++s,@PICFLAG@,$PICFLAG,;t t
+ s,@EGREP@,$EGREP,;t t
+ s,@LIBOBJS@,$LIBOBJS,;t t
+ s,@CHECK@,$CHECK,;t t
+Index: gcc-4.3.2/libiberty/configure.ac
+===================================================================
+--- gcc-4.3.2.orig/libiberty/configure.ac	2007-07-17 10:52:28.000000000 -0700
++++ gcc-4.3.2/libiberty/configure.ac	2008-08-28 18:18:37.000000000 -0700
+@@ -187,9 +187,7 @@
+ esac
+ 
+ if [[ -n "${frag}" ]]; then
+-  frags=${libiberty_topdir}/libiberty/config/$frag
+-else
+-  frags=
++  frag=${libiberty_topdir}/libiberty/config/$frag
+ fi
+ 
+ # If they didn't specify --enable-shared, don't generate shared libs.
+@@ -200,34 +198,35 @@
+   *) shared=yes ;;
+ esac
+ if [[ "${shared}" = "yes" ]]; then
+-  frag=
+   case "${host}" in
+     *-*-cygwin*)	;;
+-    alpha*-*-linux*)	frag=mh-elfalphapic ;;
+-    arm*-*-*)		frag=mh-armpic ;;
+-    hppa*-*-*)		frag=mh-papic ;;
++    alpha*-*-linux*)	PICFLAG=-fPIC ;;
++    arm*-*-*)		PICFLAG=-fPIC ;;
++    hppa*-*-*)		PICFLAG=-fPIC ;;
++    i370-*-*)		PICFLAG=-fPIC ;;
++    ia64-*-*)		PICFLAG=-fpic ;;
+     i[[34567]]86-*-* | x86_64-*-*)
+-			frag=mh-x86pic ;;
++			PICFLAG=-fpic ;;
++    m68k-*-*)		PICFLAG=-fpic ;;
++    mips*-*-linux)	PICFLAG=-fPIC ;;
+     powerpc*-*-aix*)	;;
+-    powerpc*-*-*)	frag=mh-ppcpic ;;
+-    sparc*-*-*)		frag=mh-sparcpic ;;
+-    s390*-*-*)		frag=mh-s390pic ;;
+-    *)			frag=mh-${host_cpu}pic ;;
++    powerpc*-*-*)	PICFLAG=-fPIC ;;
++    sparc*-*-*)		case "${CFLAGS}" in
++			  *-fpic* ) PICFLAG=-fpic ;;
++			  * ) PICFLAG=-fPIC ;;
++			esac ;;
++    s390*-*-*)		PICFLAG=-fpic ;;
+   esac
+-  if [[ -n "${frag}" ]]; then
+-    frags="${frags} ${libiberty_topdir}/config/${frag}"
+-  fi
+ fi
++AC_SUBST(PICFLAG)
+ 
+ echo "# Warning: this fragment is automatically generated" > temp-frag
+ 
+-for frag in ${frags}; do
+-  if [[ -f ${frag} ]]; then
+-    echo "Appending ${frag} to xhost-mkfrag"
+-    echo "# Following fragment copied from ${frag}" >> temp-frag
+-    cat ${frag} >> temp-frag
+-  fi
+-done
++if [[ -n "${frag}" ]] && [[ -f "${frag}" ]]; then
++  echo "Appending ${frag} to xhost-mkfrag"
++  echo "# Following fragment copied from ${frag}" >> temp-frag
++  cat ${frag} >> temp-frag
++fi
+ 
+ # record if we want to build shared libs.
+ if [[ "${shared}" = "yes" ]]; then
+--- /tmp/configure	2008-11-18 10:35:33.000000000 +0100
++++ gcc-4.3/configure	2008-11-18 10:36:16.000000000 +0100
+@@ -272,7 +272,7 @@
+ PACKAGE_BUGREPORT=
+ 
+ ac_unique_file="move-if-change"
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CPPFLAGS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CPPFLAGS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
+ ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
+ 
+ # Initialize some variables set by options.
+@@ -5147,6 +5147,38 @@
+ fi;
+ 
+ 
++# 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
++
++
++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
++
++
+ # 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
+@@ -12827,6 +12859,8 @@
+ s,@stage1_languages@,$stage1_languages,;t t
+ s,@SYSROOT_CFLAGS_FOR_TARGET@,$SYSROOT_CFLAGS_FOR_TARGET,;t t
+ s,@DEBUG_PREFIX_CFLAGS_FOR_TARGET@,$DEBUG_PREFIX_CFLAGS_FOR_TARGET,;t t
++s,@CFLAGS_FOR_TARGET@,$CFLAGS_FOR_TARGET,;t t
++s,@CXXFLAGS_FOR_TARGET@,$CXXFLAGS_FOR_TARGET,;t t
+ s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t
+ s,@tooldir@,$tooldir,;t t
+ s,@build_tooldir@,$build_tooldir,;t t
+--- /tmp/Makefile.in	2008-11-18 10:38:27.000000000 +0100
++++ gcc-4.3/gcc/Makefile.in	2008-11-18 10:41:43.000000000 +0100
+@@ -689,7 +689,7 @@
+ 
+ # Native linker and preprocessor flags.  For x-fragment overrides.
+ ifeq ($(host),$(build))
+-BUILD_LDFLAGS=$(LDFLAGS)
++BUILD_LDFLAGS=@BUILD_LDFLAGS@
+ else
+ BUILD_LDFLAGS=
+ endif
+--- /tmp/configure.ac	2008-11-18 10:44:09.000000000 +0100
++++ gcc-4.3/gcc/configure.ac	2008-11-18 10:46:45.000000000 +0100
+@@ -1484,6 +1484,7 @@
+ 	esac
+ 	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" LDFLAGS="" \
++	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+ 	${realsrcdir}/configure \
+ 		--enable-languages=${enable_languages-all} \
+ 		--target=$target_alias --host=$build_alias --build=$build_alias
+@@ -1785,6 +1786,7 @@
+ CC_FOR_BUILD='$(CC)'		AC_SUBST(CC_FOR_BUILD)
+ BUILD_CFLAGS='$(ALL_CFLAGS)'	AC_SUBST(BUILD_CFLAGS)
+ BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'   AC_SUBST(BUILD_CPPFLAGS)
++BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
+ STMP_FIXINC=stmp-fixinc		AC_SUBST(STMP_FIXINC)
+ 
+ # Possibly disable fixproto, on a per-target basis.
+--- /tmp/configure	2008-11-18 10:48:48.000000000 +0100
++++ gcc-4.3/gcc/configure	2008-11-18 10:54:03.000000000 +0100
+@@ -458,7 +458,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical licensedir build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_CPPFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical licensedir build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS BUILD_CPPFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
+ ac_subst_files='language_hooks'
+ 
+ # Initialize some variables set by options.
+@@ -13046,7 +13046,7 @@
+ 	*) realsrcdir=../${srcdir};;
+ 	esac
+ 	saved_CFLAGS="${CFLAGS}"
+-	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" LDFLAGS="" \
++	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+ 	${realsrcdir}/configure \
+ 		--enable-languages=${enable_languages-all} \
+ 		--target=$target_alias --host=$build_alias --build=$build_alias
+@@ -13550,6 +13550,7 @@
+ # These are the normal (build=host) settings:
+ CC_FOR_BUILD='$(CC)'
+ BUILD_CFLAGS='$(ALL_CFLAGS)'
++BUILD_LDFLAGS='$(LDFLAGS)'
+ BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'
+ STMP_FIXINC=stmp-fixinc
+ 
+@@ -24035,6 +24036,7 @@
+ s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
+ s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
+ s,@BUILD_CPPFLAGS@,$BUILD_CPPFLAGS,;t t
++s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t
+ s,@STMP_FIXINC@,$STMP_FIXINC,;t t
+ s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t
+ s,@collect2@,$collect2,;t t
diff --git a/recipes/gcc/gcc-csl-arm-2008q3/gcc-csl-2008q3-hotfix.diff b/recipes/gcc/gcc-csl-arm-2008q3/gcc-csl-2008q3-hotfix.diff
new file mode 100644
index 0000000000..18f2328574
--- /dev/null
+++ b/recipes/gcc/gcc-csl-arm-2008q3/gcc-csl-2008q3-hotfix.diff
@@ -0,0 +1,2106 @@
+diff -Nurd gcc-4.3/ChangeLog.csl gcc-4.3-new/ChangeLog.csl
+--- gcc-4.3/ChangeLog.csl	2008-10-01 14:56:28.000000000 +0200
++++ gcc-4.3-new/ChangeLog.csl	2008-10-18 13:08:51.000000000 +0200
+@@ -1,3 +1,190 @@
++2008-10-16  Nathan Froyd  <froydnj@codesourcery.com>
++
++	gcc/
++	* config.gcc (powerpc-*-eabi*): Add rs6000/t-cs-eabi when
++	--enable-extra-sgxx-multilibs is passed to configure.
++	* config/rs6000/t-ppcgas (MULTILIB_OPTIONS): Remove te500mc.
++	(MULTILIB_DIRNAMES): Likewise.
++	(MULTILIB_EXCEPTIONS): Likewise.
++	* config/rs6000/t-cs-eabi: New file.
++
++2008-10-16  Julian Brown  <julian@codesourcery.com>
++
++	Issue #4039
++
++	gcc/
++	* config/arm/neon.md (movmisalign<mode>): Use expander/unnamed insn
++	for both D & Q variants. Don't permit both operands to be mems.
++	* release-notes-csl.xml (Misaligned NEON memory accesses): Add note.
++
++2008-10-15  Catherine Moore  <clm@codesourcery.com>
++
++	gcc/testsuite/
++	* gcc-target/mips/octeon-1.c (dg-mips-options): Use -mno-abicalls.
++	* gcc-target/mips/octeon-5.c (dg-mips-options): Likewise.
++	* gcc-target/mips/octeon-6.c (dg-mips-options): Likewise.
++	* gcc-target/mips/octeon-18.c (dg-mips-options): Likewise.
++	* gcc-target/mips/octeon-19.c (dg-mips-options): Likewise.
++	* gcc-target/mips/octeon-23.c (dg-mips-options): Likewise.
++	* gcc-target/mips/octeon-28.c (dg-mips-options): Likewise.
++	* gcc-target/mips/octeon-34.c (dg-mips-options): Likewise.
++	* gcc-target/mips/octeon-37.c (dg-mips-options): Likewise.
++	* gcc-target/mips/octeon-43.c (dg-mips-options): Likewise.
++	* gcc-target/mips/octeon-44.c (dg-mips-options): Likewise.
++	* gcc-target/mips/octeon-49.c (dg-mips-options): Likewise.
++	* gcc-target/mips/octeon-54.c (dg-mips-options): Likewise.
++
++2008-10-14  Sandra Loosemore  <sandra@codesourcery.com>
++
++	Issue #4017
++
++	* release-notes-csl.xml (Linker script option syntax): New note.
++
++	gcc/
++	* config.gcc (powerpc-*): Make t-ppcgas imply usegas.h.
++	* config/svr4.h (SVR4_ASM_SPEC): New.
++	(ASM_SPEC): Inherit from SVR4_ASM_SPEC.
++	* config/rs6000/sysv4.h (ASM_SPEC): Inherit from SVR4_ASM_SPEC.
++	
++	gcc/doc/
++	* invoke.texi (Option Summary): Add -T to linker options.
++	(Link Options): Document -T.
++	
++2008-10-13  Nathan Froyd  <froydnj@codesourcery.com>
++
++	gcc/
++	* config/rs6000/rs6000.c (rs6000_file_start): Output gnu
++	attribute for struct return convention.
++
++2008-10-13  Paul Brook  <paul@codesourcery.com>
++
++	gcc/
++	* config/arm/arm.h (fputype): Remove stray comma.
++
++2008-10-13  Andrew Stubbs  <ams@codesourcery.com>
++
++	Issue #3884
++
++	gcc/
++	* doc/invoke.texi (PowerPC Options): -meabi option no longer places
++	__eabi function in main.
++
++2008-10-12  Mark Mitchell  <mark@codesourcery.com>
++
++	Issue #3224
++	* release-notes-csl.xml: Mention OpenMP add-on.
++
++2008-10-12  Catherine Moore  <clm@codesourcery.com>
++
++	Issue # 3903
++
++	Backport:
++
++	2008-07-28  Ilie Garbacea  <ilie@mips.com>
++	            Chao-ying Fu  <fu@mips.com>
++
++	* configure.tgt: Enable futex for MIPS.
++	* config/linux/mips/futex.h: New file.
++
++2008-10-12  Catherine Moore  <clm@codesourcery.com>
++
++	gcc/
++	* config/mips/mips.opt (muclibc): New option entry.
++	* config/mips/mips.c (mips_override_options): Disable
++	__thread support when the -muclibc option is used.
++
++2008-10-11  Maxim Kuvyrkov  <maxim@codesourcery.com>
++
++	gcc/
++	* config/m68k/lb1sf68.asm (PICCALL, PICJUMP): Use GOT instead of
++	PC-relative addressing when compiling for uclinux PIC.
++
++2008-10-09  Catherine Moore  <clm@codesourcery.com>
++
++	Issue #3312
++
++	gcc/
++	* config/mips/mips.h ( DSP_CTRL_REG_FIRST): Define.
++	(DSP_CTRL_REG_LAST): Define.
++	* config/mips/mips.c (mips_conditional_register_usage): Handle
++	DSP registers.
++
++2008-10-08  Maxim Kuvyrkov  <maxim@codesourcery.com>
++
++	* release-notes-csl.xml: Fix typo.
++
++2008-10-08  Nathan Sidwell  <nathan@codesourcery.com>
++	    Maxim Kuvyrkov  <maxim@codesourcery.com>
++
++	* release-notes-csl.xml (Shared Libraries bug fix): New.
++
++	gcc/
++	* config/m68k/lb1sf68.asm (__cmpdf_internal, __cmpsf_internal): Hide.
++	(__cmpdf, __cmpsf): Use PIC call sequence.
++
++2008-10-07  Nathan Froyd  <froydnj@codesourcery.com>
++
++	Issue #3988
++
++	* release-notes-csl.xml (Dynamic libraries and -Os bug fix): New.
++
++	gcc/
++	* config/rs6000/ppc-asm.h (HIDDEN_FUNC): New macro.
++	* config/rs6000/crtresfpr.asm, config/rs6000/crtresgpr.asm,
++	config/rs6000/crtresxfpr.asm, config/rs6000/crtresxgpr.asm,
++	config/rs6000/crtsavfpr.asm, config/rs6000/crtsavgpr.asm,
++	config/rs6000/e500crtres32gpr.asm,
++	config/rs6000/e500crtres64gpr.asm,
++	config/rs6000/e500crtres64gprctr.asm,
++	config/rs6000/e500crtrest32gpr.asm,
++	config/rs6000/e500crtrest64gpr.asm,
++	config/rs6000/e500crtresx32gpr.asm,
++	config/rs6000/e500crtresx64gpr.asm,
++	config/rs6000/e500crtsav32gpr.asm,
++	config/rs6000/e500crtsav64gpr.asm,
++	config/rs6000/e500crtsav64gprctr.asm,
++	config/rs6000/e500crtsavg32gpr.asm,
++	config/rs6000/e500crtsavg64gpr.asm,
++	config/rs6000/e500crtsavg64gprctr.asm: Use it.
++
++2008-10-07  Nathan Sidwell  <nathan@codesourcery.com>
++
++	* release-notes-csl.xml: Document it.
++
++	gcc/
++	* doc/invoke.texi (MIPS Options): Add ice9 arch.
++	* config/mips/mips.c (mips_cpu_info_table): Add ice9 arch.
++
++2008-10-03  Catherine Moore  <clm@codesourcery.com>
++
++        gcc/testsuite/
++	* gcc.target/mips/fix-ice9a-1.c: Disable for soft-float
++	multilibs.
++	* gcc.target/mips/fix-ice9a-1.c: Likewise.
++
++2008-10-03  Kazu Hirata  <kazu@codesourcery.com>
++
++	Backport:
++	gcc/testsuite/
++	2008-09-23  Eric Botcazou  <ebotcazou@adacore.com>
++
++	* gcc.dg/pragma-init-fini.c: Use dg-warning in lieu of dg-error.
++	* gcc.dg/pragma-align-2.c: Likewise.
++	* gcc.dg/format/cmn-err-1.c: Likewise.
++
++2008-10-02  Catherine Moore  <clm@codesourcery.com>
++
++	gcc/testsuite/
++	* gcc.target/mips/lazy-binding-1.c: Compile with -fpic.
++
++2008-10-02  Maciej W. Rozycki  <macro@codesourcery.com>
++
++	Issue #3673
++	gcc/testsuite/
++	* lib/target-supports.exp
++	(check_effective_target_arm_iwmmxt_ok): New procedure.
++	* gcc.dg/arm-mmx-1.c: Only run if arm_iwmmxt_ok.
++
+ 2008-09-29  Joseph Myers  <joseph@codesourcery.com>
+ 
+ 	Backport:
+diff -Nurd gcc-4.3/gcc/config/arm/arm.h gcc-4.3-new/gcc/config/arm/arm.h
+--- gcc-4.3/gcc/config/arm/arm.h	2008-10-01 14:51:02.000000000 +0200
++++ gcc-4.3-new/gcc/config/arm/arm.h	2008-10-18 12:44:43.000000000 +0200
+@@ -329,7 +329,7 @@
+   /* Neon.  */
+   FPUTYPE_NEON,
+   /* Neon with half-precision float extensions.  */
+-  FPUTYPE_NEON_FP16,
++  FPUTYPE_NEON_FP16
+ };
+ 
+ /* Recast the floating point class to be the floating point attribute.  */
+diff -Nurd gcc-4.3/gcc/config/arm/neon.md gcc-4.3-new/gcc/config/arm/neon.md
+--- gcc-4.3/gcc/config/arm/neon.md	2008-10-01 14:51:02.000000000 +0200
++++ gcc-4.3-new/gcc/config/arm/neon.md	2008-10-18 12:44:43.000000000 +0200
+@@ -659,21 +659,36 @@
+   neon_disambiguate_copy (operands, dest, src, 4);
+ })
+ 
+-(define_insn "movmisalign<mode>"
++(define_expand "movmisalign<mode>"
++  [(set (match_operand:VDQX 0 "nonimmediate_operand"         "")
++	(unspec:VDQX [(match_operand:VDQX 1 "general_operand" "")]
++		     UNSPEC_MISALIGNED_ACCESS))]
++  "TARGET_NEON && !BYTES_BIG_ENDIAN"
++{
++  if (!s_register_operand (operands[0], <MODE>mode)
++      && !s_register_operand (operands[1], <MODE>mode))
++    FAIL;
++})
++
++(define_insn "*movmisalign<mode>_neon"
+   [(set (match_operand:VDX 0 "nonimmediate_operand"         "=Um,w")
+ 	(unspec:VDX [(match_operand:VDX 1 "general_operand" " w, Um")]
+ 		    UNSPEC_MISALIGNED_ACCESS))]
+-  "TARGET_NEON && !BYTES_BIG_ENDIAN"
++  "TARGET_NEON && !BYTES_BIG_ENDIAN
++   && (   s_register_operand (operands[0], <MODE>mode)
++       || s_register_operand (operands[1], <MODE>mode))"
+   "@
+   vst1.<V_sz_elem>\t{%P1}, %A0
+   vld1.<V_sz_elem>\t{%P0}, %A1"
+   [(set_attr "neon_type" "neon_vst1_1_2_regs_vst2_2_regs,neon_vld1_1_2_regs")])
+ 
+-(define_insn "movmisalign<mode>"
++(define_insn "*movmisalign<mode>_neon"
+   [(set (match_operand:VQX 0 "nonimmediate_operand"         "=Um,w")
+ 	(unspec:VQX [(match_operand:VQX 1 "general_operand" " w, Um")]
+ 		    UNSPEC_MISALIGNED_ACCESS))]
+-  "TARGET_NEON && !BYTES_BIG_ENDIAN"
++  "TARGET_NEON && !BYTES_BIG_ENDIAN
++   && (   s_register_operand (operands[0], <MODE>mode)
++       || s_register_operand (operands[1], <MODE>mode))"
+   "@
+   vst1.<V_sz_elem>\t{%q1}, %A0
+   vld1.<V_sz_elem>\t{%q0}, %A1"
+diff -Nurd gcc-4.3/gcc/config/m68k/lb1sf68.asm gcc-4.3-new/gcc/config/m68k/lb1sf68.asm
+--- gcc-4.3/gcc/config/m68k/lb1sf68.asm	2008-10-01 14:50:48.000000000 +0200
++++ gcc-4.3-new/gcc/config/m68k/lb1sf68.asm	2008-10-18 12:43:53.000000000 +0200
+@@ -129,30 +129,6 @@
+ 
+ #else /* __PIC__ */
+ 
+-	/* Common for Linux and uClinux, the latter with either
+-	   -mid-shared-library or -msep-data.  */
+-
+-	.macro PICCALL addr
+-#if defined (__mcoldfire__) && !defined (__mcfisab__) && !defined (__mcfisac__)
+-	lea	\addr-.-8,a0
+-	jsr	pc@(a0)
+-#else
+-	bsr	\addr
+-#endif
+-	.endm
+-
+-	.macro PICJUMP addr
+-	/* ISA C has no bra.l instruction, and since this assembly file
+-	   gets assembled into multiple object files, we avoid the
+-	   bra instruction entirely.  */
+-#if defined (__mcoldfire__) && !defined (__mcfisab__)
+-	lea	\addr-.-8,a0
+-	jmp	pc@(a0)
+-#else
+-	bra	\addr
+-#endif
+-	.endm
+-
+ # if defined (__uClinux__)
+ 
+ 	/* Versions for uClinux */
+@@ -171,6 +147,16 @@
+ 	movel	\sym@GOT(\areg), sp@-
+ 	.endm
+ 
++	.macro PICCALL addr
++	PICLEA	\addr,a0
++	jsr	a0@
++	.endm
++
++	.macro PICJUMP addr
++	PICLEA	\addr,a0
++	jmp	a0@
++	.endm
++
+ #  else /* !__ID_SHARED_LIBRARY__ */
+ 
+ 	/* Versions for -msep-data */
+@@ -183,6 +169,27 @@
+ 	movel	\sym@GOT(a5), sp@-
+ 	.endm
+ 
++	.macro PICCALL addr
++#if defined (__mcoldfire__) && !defined (__mcfisab__) && !defined (__mcfisac__)
++	lea	\addr-.-8,a0
++	jsr	pc@(a0)
++#else
++	bsr	\addr
++#endif
++	.endm
++
++	.macro PICJUMP addr
++	/* ISA C has no bra.l instruction, and since this assembly file
++	   gets assembled into multiple object files, we avoid the
++	   bra instruction entirely.  */
++#if defined (__mcoldfire__) && !defined (__mcfisab__)
++	lea	\addr-.-8,a0
++	jmp	pc@(a0)
++#else
++	bra	\addr
++#endif
++	.endm
++
+ #  endif
+ 
+ # else /* !__uClinux__ */
+@@ -201,6 +208,27 @@
+ 	movel	\sym@GOT(\areg), sp@-
+ 	.endm
+ 
++	.macro PICCALL addr
++#if defined (__mcoldfire__) && !defined (__mcfisab__) && !defined (__mcfisac__)
++	lea	\addr-.-8,a0
++	jsr	pc@(a0)
++#else
++	bsr	\addr
++#endif
++	.endm
++
++	.macro PICJUMP addr
++	/* ISA C has no bra.l instruction, and since this assembly file
++	   gets assembled into multiple object files, we avoid the
++	   bra instruction entirely.  */
++#if defined (__mcoldfire__) && !defined (__mcfisab__)
++	lea	\addr-.-8,a0
++	jmp	pc@(a0)
++#else
++	bra	\addr
++#endif
++	.endm
++
+ # endif
+ #endif /* __PIC__ */
+ 
+@@ -648,6 +676,7 @@
+ 	.globl SYM (__negdf2)
+ 	.globl SYM (__cmpdf2)
+ 	.globl SYM (__cmpdf2_internal)
++	.hidden SYM (__cmpdf2_internal)
+ 
+ 	.text
+ 	.even
+@@ -2410,7 +2439,7 @@
+ 	movl	a6@(16),sp@-
+ 	movl	a6@(12),sp@-
+ 	movl	a6@(8),sp@-
+-	bsr	SYM (__cmpdf2_internal)
++	PICCALL	SYM (__cmpdf2_internal)
+ 	unlk	a6
+ 	rts
+ 
+@@ -2562,6 +2591,7 @@
+ 	.globl SYM (__negsf2)
+ 	.globl SYM (__cmpsf2)
+ 	.globl SYM (__cmpsf2_internal)
++	.hidden SYM (__cmpsf2_internal)
+ 
+ | These are common routines to return and signal exceptions.	
+ 
+@@ -3816,7 +3846,7 @@
+ 	pea	1
+ 	movl	a6@(12),sp@-
+ 	movl	a6@(8),sp@-
+-	bsr (__cmpsf2_internal)
++	PICCALL SYM (__cmpsf2_internal)
+ 	unlk	a6
+ 	rts
+ 
+diff -Nurd gcc-4.3/gcc/config/mips/mips.c gcc-4.3-new/gcc/config/mips/mips.c
+--- gcc-4.3/gcc/config/mips/mips.c	2008-10-01 14:51:08.000000000 +0200
++++ gcc-4.3-new/gcc/config/mips/mips.c	2008-10-18 12:45:05.000000000 +0200
+@@ -657,6 +657,7 @@
+   { "sr71000", PROCESSOR_SR71000, 64, PTF_AVOID_BRANCHLIKELY },
+   { "xlr", PROCESSOR_XLR, 64, 0 },
+   { "octeon", PROCESSOR_OCTEON, 64, 0 },
++  { "ice9", PROCESSOR_5KF, 64 }, /* May diverge from 5kf in future. */
+ };
+ 
+ /* Default costs.  If these are used for a processor we should look
+@@ -12577,6 +12578,10 @@
+   /* Function to allocate machine-dependent function status.  */
+   init_machine_status = &mips_init_machine_status;
+ 
++  /* __thread_support is not supported by uClibc.  */
++  if (building_for_uclibc)
++    targetm.have_tls = 0;
++
+   /* Default to working around R4000 errata only if the processor
+      was selected explicitly.  */
+   if ((target_flags_explicit & MASK_FIX_R4000) == 0
+@@ -12629,18 +12634,24 @@
+ #undef SWAP_STRING
+ #undef SWAP_INT
+ }
+-
+-/* Implement CONDITIONAL_REGISTER_USAGE.  */
+-
+ void
+ mips_conditional_register_usage (void)
+ {
++
++  /* These DSP control register fields are global.  */
++  if (ISA_HAS_DSP)
++    {
++      global_regs[CCDSP_PO_REGNUM] = 1;
++      global_regs[CCDSP_SC_REGNUM] = 1;
++    }
+   if (!ISA_HAS_DSP)
+     {
+       int regno;
+ 
+       for (regno = DSP_ACC_REG_FIRST; regno <= DSP_ACC_REG_LAST; regno++)
+ 	fixed_regs[regno] = call_used_regs[regno] = 1;
++      for (regno = DSP_CTRL_REG_FIRST; regno <= DSP_CTRL_REG_LAST; regno++)
++	fixed_regs[regno] = call_used_regs[regno] = 1;
+     }
+   if (!TARGET_HARD_FLOAT)
+     {
+diff -Nurd gcc-4.3/gcc/config/mips/mips.h gcc-4.3-new/gcc/config/mips/mips.h
+--- gcc-4.3/gcc/config/mips/mips.h	2008-10-01 14:51:08.000000000 +0200
++++ gcc-4.3-new/gcc/config/mips/mips.h	2008-10-18 12:45:05.000000000 +0200
+@@ -1615,6 +1615,9 @@
+ #define DSP_ACC_REG_LAST 181
+ #define DSP_ACC_REG_NUM (DSP_ACC_REG_LAST - DSP_ACC_REG_FIRST + 1)
+ 
++#define DSP_CTRL_REG_FIRST 182
++#define DSP_CTRL_REG_LAST 187
++
+ #define AT_REGNUM	(GP_REG_FIRST + 1)
+ #define HI_REGNUM	(TARGET_BIG_ENDIAN ? MD_REG_FIRST : MD_REG_FIRST + 1)
+ #define LO_REGNUM	(TARGET_BIG_ENDIAN ? MD_REG_FIRST + 1 : MD_REG_FIRST)
+diff -Nurd gcc-4.3/gcc/config/mips/mips.opt gcc-4.3-new/gcc/config/mips/mips.opt
+--- gcc-4.3/gcc/config/mips/mips.opt	2008-10-01 14:51:08.000000000 +0200
++++ gcc-4.3-new/gcc/config/mips/mips.opt	2008-10-18 12:45:05.000000000 +0200
+@@ -272,6 +272,10 @@
+ Target RejectNegative Joined Var(mips_tune_string)
+ -mtune=PROCESSOR	Optimize the output for PROCESSOR
+ 
++muclibc
++Target RejectNegative Var(building_for_uclibc)
++Building with -muclibc
++
+ muninit-const-in-rodata
+ Target Report Var(TARGET_UNINIT_CONST_IN_RODATA)
+ Put uninitialized constants in ROM (needs -membedded-data)
+diff -Nurd gcc-4.3/gcc/config/rs6000/crtresfpr.asm gcc-4.3-new/gcc/config/rs6000/crtresfpr.asm
+--- gcc-4.3/gcc/config/rs6000/crtresfpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/crtresfpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -49,24 +49,24 @@
+ /* Called with r11 pointing to the stack header word of the caller of the */
+ /* function, just beyond the end of the floating point save area.  */
+ 
+-FUNC_START(_restfpr_14)	lfd	14,-144(11)	/* restore fp registers */
+-FUNC_START(_restfpr_15)	lfd	15,-136(11)
+-FUNC_START(_restfpr_16)	lfd	16,-128(11)
+-FUNC_START(_restfpr_17)	lfd	17,-120(11)
+-FUNC_START(_restfpr_18)	lfd	18,-112(11)
+-FUNC_START(_restfpr_19)	lfd	19,-104(11)
+-FUNC_START(_restfpr_20)	lfd	20,-96(11)
+-FUNC_START(_restfpr_21)	lfd	21,-88(11)
+-FUNC_START(_restfpr_22)	lfd	22,-80(11)
+-FUNC_START(_restfpr_23)	lfd	23,-72(11)
+-FUNC_START(_restfpr_24)	lfd	24,-64(11)
+-FUNC_START(_restfpr_25)	lfd	25,-56(11)
+-FUNC_START(_restfpr_26)	lfd	26,-48(11)
+-FUNC_START(_restfpr_27)	lfd	27,-40(11)
+-FUNC_START(_restfpr_28)	lfd	28,-32(11)
+-FUNC_START(_restfpr_29)	lfd	29,-24(11)
+-FUNC_START(_restfpr_30)	lfd	30,-16(11)
+-FUNC_START(_restfpr_31)	lfd	31,-8(11)
++HIDDEN_FUNC(_restfpr_14)	lfd	14,-144(11)	/* restore fp registers */
++HIDDEN_FUNC(_restfpr_15)	lfd	15,-136(11)
++HIDDEN_FUNC(_restfpr_16)	lfd	16,-128(11)
++HIDDEN_FUNC(_restfpr_17)	lfd	17,-120(11)
++HIDDEN_FUNC(_restfpr_18)	lfd	18,-112(11)
++HIDDEN_FUNC(_restfpr_19)	lfd	19,-104(11)
++HIDDEN_FUNC(_restfpr_20)	lfd	20,-96(11)
++HIDDEN_FUNC(_restfpr_21)	lfd	21,-88(11)
++HIDDEN_FUNC(_restfpr_22)	lfd	22,-80(11)
++HIDDEN_FUNC(_restfpr_23)	lfd	23,-72(11)
++HIDDEN_FUNC(_restfpr_24)	lfd	24,-64(11)
++HIDDEN_FUNC(_restfpr_25)	lfd	25,-56(11)
++HIDDEN_FUNC(_restfpr_26)	lfd	26,-48(11)
++HIDDEN_FUNC(_restfpr_27)	lfd	27,-40(11)
++HIDDEN_FUNC(_restfpr_28)	lfd	28,-32(11)
++HIDDEN_FUNC(_restfpr_29)	lfd	29,-24(11)
++HIDDEN_FUNC(_restfpr_30)	lfd	30,-16(11)
++HIDDEN_FUNC(_restfpr_31)	lfd	31,-8(11)
+ 			blr
+ FUNC_END(_restfpr_31)
+ FUNC_END(_restfpr_30)
+diff -Nurd gcc-4.3/gcc/config/rs6000/crtresgpr.asm gcc-4.3-new/gcc/config/rs6000/crtresgpr.asm
+--- gcc-4.3/gcc/config/rs6000/crtresgpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/crtresgpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -49,24 +49,24 @@
+ /* Called with r11 pointing to the stack header word of the caller of the */
+ /* function, just beyond the end of the integer restore area.  */
+ 
+-FUNC_START(_restgpr_14)	lwz	14,-72(11)	/* restore gp registers */
+-FUNC_START(_restgpr_15)	lwz	15,-68(11)
+-FUNC_START(_restgpr_16)	lwz	16,-64(11)
+-FUNC_START(_restgpr_17)	lwz	17,-60(11)
+-FUNC_START(_restgpr_18)	lwz	18,-56(11)
+-FUNC_START(_restgpr_19)	lwz	19,-52(11)
+-FUNC_START(_restgpr_20)	lwz	20,-48(11)
+-FUNC_START(_restgpr_21)	lwz	21,-44(11)
+-FUNC_START(_restgpr_22)	lwz	22,-40(11)
+-FUNC_START(_restgpr_23)	lwz	23,-36(11)
+-FUNC_START(_restgpr_24)	lwz	24,-32(11)
+-FUNC_START(_restgpr_25)	lwz	25,-28(11)
+-FUNC_START(_restgpr_26)	lwz	26,-24(11)
+-FUNC_START(_restgpr_27)	lwz	27,-20(11)
+-FUNC_START(_restgpr_28)	lwz	28,-16(11)
+-FUNC_START(_restgpr_29)	lwz	29,-12(11)
+-FUNC_START(_restgpr_30)	lwz	30,-8(11)
+-FUNC_START(_restgpr_31)	lwz	31,-4(11)
++HIDDEN_FUNC(_restgpr_14)	lwz	14,-72(11)	/* restore gp registers */
++HIDDEN_FUNC(_restgpr_15)	lwz	15,-68(11)
++HIDDEN_FUNC(_restgpr_16)	lwz	16,-64(11)
++HIDDEN_FUNC(_restgpr_17)	lwz	17,-60(11)
++HIDDEN_FUNC(_restgpr_18)	lwz	18,-56(11)
++HIDDEN_FUNC(_restgpr_19)	lwz	19,-52(11)
++HIDDEN_FUNC(_restgpr_20)	lwz	20,-48(11)
++HIDDEN_FUNC(_restgpr_21)	lwz	21,-44(11)
++HIDDEN_FUNC(_restgpr_22)	lwz	22,-40(11)
++HIDDEN_FUNC(_restgpr_23)	lwz	23,-36(11)
++HIDDEN_FUNC(_restgpr_24)	lwz	24,-32(11)
++HIDDEN_FUNC(_restgpr_25)	lwz	25,-28(11)
++HIDDEN_FUNC(_restgpr_26)	lwz	26,-24(11)
++HIDDEN_FUNC(_restgpr_27)	lwz	27,-20(11)
++HIDDEN_FUNC(_restgpr_28)	lwz	28,-16(11)
++HIDDEN_FUNC(_restgpr_29)	lwz	29,-12(11)
++HIDDEN_FUNC(_restgpr_30)	lwz	30,-8(11)
++HIDDEN_FUNC(_restgpr_31)	lwz	31,-4(11)
+ 			blr
+ FUNC_END(_restgpr_31)
+ FUNC_END(_restgpr_30)
+diff -Nurd gcc-4.3/gcc/config/rs6000/crtresxfpr.asm gcc-4.3-new/gcc/config/rs6000/crtresxfpr.asm
+--- gcc-4.3/gcc/config/rs6000/crtresxfpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/crtresxfpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -51,24 +51,24 @@
+ /* In addition to restoring the fp registers, it will return to the caller's */
+ /* caller */
+ 
+-FUNC_START(_restfpr_14_x)	lfd	14,-144(11)	/* restore fp registers */
+-FUNC_START(_restfpr_15_x)	lfd	15,-136(11)
+-FUNC_START(_restfpr_16_x)	lfd	16,-128(11)
+-FUNC_START(_restfpr_17_x)	lfd	17,-120(11)
+-FUNC_START(_restfpr_18_x)	lfd	18,-112(11)
+-FUNC_START(_restfpr_19_x)	lfd	19,-104(11)
+-FUNC_START(_restfpr_20_x)	lfd	20,-96(11)
+-FUNC_START(_restfpr_21_x)	lfd	21,-88(11)
+-FUNC_START(_restfpr_22_x)	lfd	22,-80(11)
+-FUNC_START(_restfpr_23_x)	lfd	23,-72(11)
+-FUNC_START(_restfpr_24_x)	lfd	24,-64(11)
+-FUNC_START(_restfpr_25_x)	lfd	25,-56(11)
+-FUNC_START(_restfpr_26_x)	lfd	26,-48(11)
+-FUNC_START(_restfpr_27_x)	lfd	27,-40(11)
+-FUNC_START(_restfpr_28_x)	lfd	28,-32(11)
+-FUNC_START(_restfpr_29_x)	lfd	29,-24(11)
+-FUNC_START(_restfpr_30_x)	lfd	30,-16(11)
+-FUNC_START(_restfpr_31_x)	lwz	0,4(11)
++HIDDEN_FUNC(_restfpr_14_x)	lfd	14,-144(11)	/* restore fp registers */
++HIDDEN_FUNC(_restfpr_15_x)	lfd	15,-136(11)
++HIDDEN_FUNC(_restfpr_16_x)	lfd	16,-128(11)
++HIDDEN_FUNC(_restfpr_17_x)	lfd	17,-120(11)
++HIDDEN_FUNC(_restfpr_18_x)	lfd	18,-112(11)
++HIDDEN_FUNC(_restfpr_19_x)	lfd	19,-104(11)
++HIDDEN_FUNC(_restfpr_20_x)	lfd	20,-96(11)
++HIDDEN_FUNC(_restfpr_21_x)	lfd	21,-88(11)
++HIDDEN_FUNC(_restfpr_22_x)	lfd	22,-80(11)
++HIDDEN_FUNC(_restfpr_23_x)	lfd	23,-72(11)
++HIDDEN_FUNC(_restfpr_24_x)	lfd	24,-64(11)
++HIDDEN_FUNC(_restfpr_25_x)	lfd	25,-56(11)
++HIDDEN_FUNC(_restfpr_26_x)	lfd	26,-48(11)
++HIDDEN_FUNC(_restfpr_27_x)	lfd	27,-40(11)
++HIDDEN_FUNC(_restfpr_28_x)	lfd	28,-32(11)
++HIDDEN_FUNC(_restfpr_29_x)	lfd	29,-24(11)
++HIDDEN_FUNC(_restfpr_30_x)	lfd	30,-16(11)
++HIDDEN_FUNC(_restfpr_31_x)	lwz	0,4(11)
+ 				lfd	31,-8(11)
+ 				mtlr	0
+ 				mr	1,11
+diff -Nurd gcc-4.3/gcc/config/rs6000/crtresxgpr.asm gcc-4.3-new/gcc/config/rs6000/crtresxgpr.asm
+--- gcc-4.3/gcc/config/rs6000/crtresxgpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/crtresxgpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -49,24 +49,24 @@
+ /* Called with r11 pointing to the stack header word of the caller of the */
+ /* function, just beyond the end of the integer restore area.  */
+ 
+-FUNC_START(_restgpr_14_x)	lwz	14,-72(11)	/* restore gp registers */
+-FUNC_START(_restgpr_15_x)	lwz	15,-68(11)
+-FUNC_START(_restgpr_16_x)	lwz	16,-64(11)
+-FUNC_START(_restgpr_17_x)	lwz	17,-60(11)
+-FUNC_START(_restgpr_18_x)	lwz	18,-56(11)
+-FUNC_START(_restgpr_19_x)	lwz	19,-52(11)
+-FUNC_START(_restgpr_20_x)	lwz	20,-48(11)
+-FUNC_START(_restgpr_21_x)	lwz	21,-44(11)
+-FUNC_START(_restgpr_22_x)	lwz	22,-40(11)
+-FUNC_START(_restgpr_23_x)	lwz	23,-36(11)
+-FUNC_START(_restgpr_24_x)	lwz	24,-32(11)
+-FUNC_START(_restgpr_25_x)	lwz	25,-28(11)
+-FUNC_START(_restgpr_26_x)	lwz	26,-24(11)
+-FUNC_START(_restgpr_27_x)	lwz	27,-20(11)
+-FUNC_START(_restgpr_28_x)	lwz	28,-16(11)
+-FUNC_START(_restgpr_29_x)	lwz	29,-12(11)
+-FUNC_START(_restgpr_30_x)	lwz	30,-8(11)
+-FUNC_START(_restgpr_31_x)	lwz	0,4(11)
++HIDDEN_FUNC(_restgpr_14_x)	lwz	14,-72(11)	/* restore gp registers */
++HIDDEN_FUNC(_restgpr_15_x)	lwz	15,-68(11)
++HIDDEN_FUNC(_restgpr_16_x)	lwz	16,-64(11)
++HIDDEN_FUNC(_restgpr_17_x)	lwz	17,-60(11)
++HIDDEN_FUNC(_restgpr_18_x)	lwz	18,-56(11)
++HIDDEN_FUNC(_restgpr_19_x)	lwz	19,-52(11)
++HIDDEN_FUNC(_restgpr_20_x)	lwz	20,-48(11)
++HIDDEN_FUNC(_restgpr_21_x)	lwz	21,-44(11)
++HIDDEN_FUNC(_restgpr_22_x)	lwz	22,-40(11)
++HIDDEN_FUNC(_restgpr_23_x)	lwz	23,-36(11)
++HIDDEN_FUNC(_restgpr_24_x)	lwz	24,-32(11)
++HIDDEN_FUNC(_restgpr_25_x)	lwz	25,-28(11)
++HIDDEN_FUNC(_restgpr_26_x)	lwz	26,-24(11)
++HIDDEN_FUNC(_restgpr_27_x)	lwz	27,-20(11)
++HIDDEN_FUNC(_restgpr_28_x)	lwz	28,-16(11)
++HIDDEN_FUNC(_restgpr_29_x)	lwz	29,-12(11)
++HIDDEN_FUNC(_restgpr_30_x)	lwz	30,-8(11)
++HIDDEN_FUNC(_restgpr_31_x)	lwz	0,4(11)
+ 				lwz	31,-4(11)
+ 				mtlr	0
+ 				mr	1,11
+diff -Nurd gcc-4.3/gcc/config/rs6000/crtsavfpr.asm gcc-4.3-new/gcc/config/rs6000/crtsavfpr.asm
+--- gcc-4.3/gcc/config/rs6000/crtsavfpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/crtsavfpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -49,24 +49,24 @@
+ /* Called with r11 pointing to the stack header word of the caller of the */
+ /* function, just beyond the end of the floating point save area.  */
+ 
+-FUNC_START(_savefpr_14)	stfd	14,-144(11)	/* save fp registers */
+-FUNC_START(_savefpr_15)	stfd	15,-136(11)
+-FUNC_START(_savefpr_16)	stfd	16,-128(11)
+-FUNC_START(_savefpr_17)	stfd	17,-120(11)
+-FUNC_START(_savefpr_18)	stfd	18,-112(11)
+-FUNC_START(_savefpr_19)	stfd	19,-104(11)
+-FUNC_START(_savefpr_20)	stfd	20,-96(11)
+-FUNC_START(_savefpr_21)	stfd	21,-88(11)
+-FUNC_START(_savefpr_22)	stfd	22,-80(11)
+-FUNC_START(_savefpr_23)	stfd	23,-72(11)
+-FUNC_START(_savefpr_24)	stfd	24,-64(11)
+-FUNC_START(_savefpr_25)	stfd	25,-56(11)
+-FUNC_START(_savefpr_26)	stfd	26,-48(11)
+-FUNC_START(_savefpr_27)	stfd	27,-40(11)
+-FUNC_START(_savefpr_28)	stfd	28,-32(11)
+-FUNC_START(_savefpr_29)	stfd	29,-24(11)
+-FUNC_START(_savefpr_30)	stfd	30,-16(11)
+-FUNC_START(_savefpr_31)	stfd	31,-8(11)
++HIDDEN_FUNC(_savefpr_14)	stfd	14,-144(11)	/* save fp registers */
++HIDDEN_FUNC(_savefpr_15)	stfd	15,-136(11)
++HIDDEN_FUNC(_savefpr_16)	stfd	16,-128(11)
++HIDDEN_FUNC(_savefpr_17)	stfd	17,-120(11)
++HIDDEN_FUNC(_savefpr_18)	stfd	18,-112(11)
++HIDDEN_FUNC(_savefpr_19)	stfd	19,-104(11)
++HIDDEN_FUNC(_savefpr_20)	stfd	20,-96(11)
++HIDDEN_FUNC(_savefpr_21)	stfd	21,-88(11)
++HIDDEN_FUNC(_savefpr_22)	stfd	22,-80(11)
++HIDDEN_FUNC(_savefpr_23)	stfd	23,-72(11)
++HIDDEN_FUNC(_savefpr_24)	stfd	24,-64(11)
++HIDDEN_FUNC(_savefpr_25)	stfd	25,-56(11)
++HIDDEN_FUNC(_savefpr_26)	stfd	26,-48(11)
++HIDDEN_FUNC(_savefpr_27)	stfd	27,-40(11)
++HIDDEN_FUNC(_savefpr_28)	stfd	28,-32(11)
++HIDDEN_FUNC(_savefpr_29)	stfd	29,-24(11)
++HIDDEN_FUNC(_savefpr_30)	stfd	30,-16(11)
++HIDDEN_FUNC(_savefpr_31)	stfd	31,-8(11)
+ 			blr
+ FUNC_END(_savefpr_31)
+ FUNC_END(_savefpr_30)
+diff -Nurd gcc-4.3/gcc/config/rs6000/crtsavgpr.asm gcc-4.3-new/gcc/config/rs6000/crtsavgpr.asm
+--- gcc-4.3/gcc/config/rs6000/crtsavgpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/crtsavgpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -49,24 +49,24 @@
+ /* Called with r11 pointing to the stack header word of the caller of the */
+ /* function, just beyond the end of the integer save area.  */
+ 
+-FUNC_START(_savegpr_14)	stw	14,-72(11)	/* save gp registers */
+-FUNC_START(_savegpr_15)	stw	15,-68(11)
+-FUNC_START(_savegpr_16)	stw	16,-64(11)
+-FUNC_START(_savegpr_17)	stw	17,-60(11)
+-FUNC_START(_savegpr_18)	stw	18,-56(11)
+-FUNC_START(_savegpr_19)	stw	19,-52(11)
+-FUNC_START(_savegpr_20)	stw	20,-48(11)
+-FUNC_START(_savegpr_21)	stw	21,-44(11)
+-FUNC_START(_savegpr_22)	stw	22,-40(11)
+-FUNC_START(_savegpr_23)	stw	23,-36(11)
+-FUNC_START(_savegpr_24)	stw	24,-32(11)
+-FUNC_START(_savegpr_25)	stw	25,-28(11)
+-FUNC_START(_savegpr_26)	stw	26,-24(11)
+-FUNC_START(_savegpr_27)	stw	27,-20(11)
+-FUNC_START(_savegpr_28)	stw	28,-16(11)
+-FUNC_START(_savegpr_29)	stw	29,-12(11)
+-FUNC_START(_savegpr_30)	stw	30,-8(11)
+-FUNC_START(_savegpr_31)	stw	31,-4(11)
++HIDDEN_FUNC(_savegpr_14)	stw	14,-72(11)	/* save gp registers */
++HIDDEN_FUNC(_savegpr_15)	stw	15,-68(11)
++HIDDEN_FUNC(_savegpr_16)	stw	16,-64(11)
++HIDDEN_FUNC(_savegpr_17)	stw	17,-60(11)
++HIDDEN_FUNC(_savegpr_18)	stw	18,-56(11)
++HIDDEN_FUNC(_savegpr_19)	stw	19,-52(11)
++HIDDEN_FUNC(_savegpr_20)	stw	20,-48(11)
++HIDDEN_FUNC(_savegpr_21)	stw	21,-44(11)
++HIDDEN_FUNC(_savegpr_22)	stw	22,-40(11)
++HIDDEN_FUNC(_savegpr_23)	stw	23,-36(11)
++HIDDEN_FUNC(_savegpr_24)	stw	24,-32(11)
++HIDDEN_FUNC(_savegpr_25)	stw	25,-28(11)
++HIDDEN_FUNC(_savegpr_26)	stw	26,-24(11)
++HIDDEN_FUNC(_savegpr_27)	stw	27,-20(11)
++HIDDEN_FUNC(_savegpr_28)	stw	28,-16(11)
++HIDDEN_FUNC(_savegpr_29)	stw	29,-12(11)
++HIDDEN_FUNC(_savegpr_30)	stw	30,-8(11)
++HIDDEN_FUNC(_savegpr_31)	stw	31,-4(11)
+ 			blr
+ FUNC_END(_savegpr_31)
+ FUNC_END(_savegpr_30)
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtres32gpr.asm gcc-4.3-new/gcc/config/rs6000/e500crtres32gpr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtres32gpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtres32gpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -43,24 +43,24 @@
+ /* Routines for restoring 32-bit integer registers, called by the compiler.  */
+ /* "Bare" versions that simply return to their caller.  */
+ 
+-FUNC_START(_rest32gpr_14)	lwz 14,-72(11)
+-FUNC_START(_rest32gpr_15)	lwz 15,-68(11)
+-FUNC_START(_rest32gpr_16)	lwz 16,-64(11)
+-FUNC_START(_rest32gpr_17)	lwz 17,-60(11)
+-FUNC_START(_rest32gpr_18)	lwz 18,-56(11)
+-FUNC_START(_rest32gpr_19)	lwz 19,-52(11)
+-FUNC_START(_rest32gpr_20)	lwz 20,-48(11)
+-FUNC_START(_rest32gpr_21)	lwz 21,-44(11)
+-FUNC_START(_rest32gpr_22)	lwz 22,-40(11)
+-FUNC_START(_rest32gpr_23)	lwz 23,-36(11)
+-FUNC_START(_rest32gpr_24)	lwz 24,-32(11)
+-FUNC_START(_rest32gpr_25)	lwz 25,-28(11)
+-FUNC_START(_rest32gpr_26)	lwz 26,-24(11)
+-FUNC_START(_rest32gpr_27)	lwz 27,-20(11)
+-FUNC_START(_rest32gpr_28)	lwz 28,-16(11)
+-FUNC_START(_rest32gpr_29)	lwz 29,-12(11)
+-FUNC_START(_rest32gpr_30)	lwz 30,-8(11)
+-FUNC_START(_rest32gpr_31)	lwz 31,-4(11)
++HIDDEN_FUNC(_rest32gpr_14)	lwz 14,-72(11)
++HIDDEN_FUNC(_rest32gpr_15)	lwz 15,-68(11)
++HIDDEN_FUNC(_rest32gpr_16)	lwz 16,-64(11)
++HIDDEN_FUNC(_rest32gpr_17)	lwz 17,-60(11)
++HIDDEN_FUNC(_rest32gpr_18)	lwz 18,-56(11)
++HIDDEN_FUNC(_rest32gpr_19)	lwz 19,-52(11)
++HIDDEN_FUNC(_rest32gpr_20)	lwz 20,-48(11)
++HIDDEN_FUNC(_rest32gpr_21)	lwz 21,-44(11)
++HIDDEN_FUNC(_rest32gpr_22)	lwz 22,-40(11)
++HIDDEN_FUNC(_rest32gpr_23)	lwz 23,-36(11)
++HIDDEN_FUNC(_rest32gpr_24)	lwz 24,-32(11)
++HIDDEN_FUNC(_rest32gpr_25)	lwz 25,-28(11)
++HIDDEN_FUNC(_rest32gpr_26)	lwz 26,-24(11)
++HIDDEN_FUNC(_rest32gpr_27)	lwz 27,-20(11)
++HIDDEN_FUNC(_rest32gpr_28)	lwz 28,-16(11)
++HIDDEN_FUNC(_rest32gpr_29)	lwz 29,-12(11)
++HIDDEN_FUNC(_rest32gpr_30)	lwz 30,-8(11)
++HIDDEN_FUNC(_rest32gpr_31)	lwz 31,-4(11)
+ 				blr
+ FUNC_END(_rest32gpr_31)
+ FUNC_END(_rest32gpr_30)
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtres64gpr.asm gcc-4.3-new/gcc/config/rs6000/e500crtres64gpr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtres64gpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtres64gpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -43,24 +43,24 @@
+ /* Routines for restoring 64-bit integer registers, called by the compiler.  */
+ /* "Bare" versions that return to their caller.  */
+ 
+-FUNC_START(_rest64gpr_14)	evldd 14,0(11)
+-FUNC_START(_rest64gpr_15)	evldd 15,8(11)
+-FUNC_START(_rest64gpr_16)	evldd 16,16(11)
+-FUNC_START(_rest64gpr_17)	evldd 17,24(11)
+-FUNC_START(_rest64gpr_18)	evldd 18,32(11)
+-FUNC_START(_rest64gpr_19)	evldd 19,40(11)
+-FUNC_START(_rest64gpr_20)	evldd 20,48(11)
+-FUNC_START(_rest64gpr_21)	evldd 21,56(11)
+-FUNC_START(_rest64gpr_22)	evldd 22,64(11)
+-FUNC_START(_rest64gpr_23)	evldd 23,72(11)
+-FUNC_START(_rest64gpr_24)	evldd 24,80(11)
+-FUNC_START(_rest64gpr_25)	evldd 25,88(11)
+-FUNC_START(_rest64gpr_26)	evldd 26,96(11)
+-FUNC_START(_rest64gpr_27)	evldd 27,104(11)
+-FUNC_START(_rest64gpr_28)	evldd 28,112(11)
+-FUNC_START(_rest64gpr_29)	evldd 29,120(11)
+-FUNC_START(_rest64gpr_30)	evldd 30,128(11)
+-FUNC_START(_rest64gpr_31)	evldd 31,136(11)
++HIDDEN_FUNC(_rest64gpr_14)	evldd 14,0(11)
++HIDDEN_FUNC(_rest64gpr_15)	evldd 15,8(11)
++HIDDEN_FUNC(_rest64gpr_16)	evldd 16,16(11)
++HIDDEN_FUNC(_rest64gpr_17)	evldd 17,24(11)
++HIDDEN_FUNC(_rest64gpr_18)	evldd 18,32(11)
++HIDDEN_FUNC(_rest64gpr_19)	evldd 19,40(11)
++HIDDEN_FUNC(_rest64gpr_20)	evldd 20,48(11)
++HIDDEN_FUNC(_rest64gpr_21)	evldd 21,56(11)
++HIDDEN_FUNC(_rest64gpr_22)	evldd 22,64(11)
++HIDDEN_FUNC(_rest64gpr_23)	evldd 23,72(11)
++HIDDEN_FUNC(_rest64gpr_24)	evldd 24,80(11)
++HIDDEN_FUNC(_rest64gpr_25)	evldd 25,88(11)
++HIDDEN_FUNC(_rest64gpr_26)	evldd 26,96(11)
++HIDDEN_FUNC(_rest64gpr_27)	evldd 27,104(11)
++HIDDEN_FUNC(_rest64gpr_28)	evldd 28,112(11)
++HIDDEN_FUNC(_rest64gpr_29)	evldd 29,120(11)
++HIDDEN_FUNC(_rest64gpr_30)	evldd 30,128(11)
++HIDDEN_FUNC(_rest64gpr_31)	evldd 31,136(11)
+ 				blr
+ FUNC_END(_rest64gpr_31)
+ FUNC_END(_rest64gpr_30)
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtres64gprctr.asm gcc-4.3-new/gcc/config/rs6000/e500crtres64gprctr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtres64gprctr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtres64gprctr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -43,41 +43,41 @@
+ /* Routines for restoring 64-bit integer registers where the number of
+    registers to be restored is passed in CTR, called by the compiler.  */
+ 
+-FUNC_START(_rest64gpr_ctr_14)	evldd 14,0(11)
++HIDDEN_FUNC(_rest64gpr_ctr_14)	evldd 14,0(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_15)	evldd 15,8(11)
++HIDDEN_FUNC(_rest64gpr_ctr_15)	evldd 15,8(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_16)	evldd 16,16(11)
++HIDDEN_FUNC(_rest64gpr_ctr_16)	evldd 16,16(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_17)	evldd 17,24(11)
++HIDDEN_FUNC(_rest64gpr_ctr_17)	evldd 17,24(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_18)	evldd 18,32(11)
++HIDDEN_FUNC(_rest64gpr_ctr_18)	evldd 18,32(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_19)	evldd 19,40(11)
++HIDDEN_FUNC(_rest64gpr_ctr_19)	evldd 19,40(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_20)	evldd 20,48(11)
++HIDDEN_FUNC(_rest64gpr_ctr_20)	evldd 20,48(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_21)	evldd 21,56(11)
++HIDDEN_FUNC(_rest64gpr_ctr_21)	evldd 21,56(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_22)	evldd 22,64(11)
++HIDDEN_FUNC(_rest64gpr_ctr_22)	evldd 22,64(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_23)	evldd 23,72(11)
++HIDDEN_FUNC(_rest64gpr_ctr_23)	evldd 23,72(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_24)	evldd 24,80(11)
++HIDDEN_FUNC(_rest64gpr_ctr_24)	evldd 24,80(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_25)	evldd 25,88(11)
++HIDDEN_FUNC(_rest64gpr_ctr_25)	evldd 25,88(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_26)	evldd 26,96(11)
++HIDDEN_FUNC(_rest64gpr_ctr_26)	evldd 26,96(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_27)	evldd 27,104(11)
++HIDDEN_FUNC(_rest64gpr_ctr_27)	evldd 27,104(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_28)	evldd 28,112(11)
++HIDDEN_FUNC(_rest64gpr_ctr_28)	evldd 28,112(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_29)	evldd 29,120(11)
++HIDDEN_FUNC(_rest64gpr_ctr_29)	evldd 29,120(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_30)	evldd 30,128(11)
++HIDDEN_FUNC(_rest64gpr_ctr_30)	evldd 30,128(11)
+ 				bdz _rest64_gpr_ctr_done
+-FUNC_START(_rest64gpr_ctr_31)	evldd 31,136(11)
++HIDDEN_FUNC(_rest64gpr_ctr_31)	evldd 31,136(11)
+ _rest64gpr_ctr_done:		blr
+ 
+ #endif
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtrest32gpr.asm gcc-4.3-new/gcc/config/rs6000/e500crtrest32gpr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtrest32gpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtrest32gpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -43,24 +43,24 @@
+ /* Routines for restoring 32-bit integer registers, called by the compiler.  */
+ /* "Tail" versions that perform a tail call.  */
+ 
+-FUNC_START(_rest32gpr_14_t)	lwz 14,-72(11)
+-FUNC_START(_rest32gpr_15_t)	lwz 15,-68(11)
+-FUNC_START(_rest32gpr_16_t)	lwz 16,-64(11)
+-FUNC_START(_rest32gpr_17_t)	lwz 17,-60(11)
+-FUNC_START(_rest32gpr_18_t)	lwz 18,-56(11)
+-FUNC_START(_rest32gpr_19_t)	lwz 19,-52(11)
+-FUNC_START(_rest32gpr_20_t)	lwz 20,-48(11)
+-FUNC_START(_rest32gpr_21_t)	lwz 21,-44(11)
+-FUNC_START(_rest32gpr_22_t)	lwz 22,-40(11)
+-FUNC_START(_rest32gpr_23_t)	lwz 23,-36(11)
+-FUNC_START(_rest32gpr_24_t)	lwz 24,-32(11)
+-FUNC_START(_rest32gpr_25_t)	lwz 25,-28(11)
+-FUNC_START(_rest32gpr_26_t)	lwz 26,-24(11)
+-FUNC_START(_rest32gpr_27_t)	lwz 27,-20(11)
+-FUNC_START(_rest32gpr_28_t)	lwz 28,-16(11)
+-FUNC_START(_rest32gpr_29_t)	lwz 29,-12(11)
+-FUNC_START(_rest32gpr_30_t)	lwz 30,-8(11)
+-FUNC_START(_rest32gpr_31_t)	lwz 31,-4(11)
++HIDDEN_FUNC(_rest32gpr_14_t)	lwz 14,-72(11)
++HIDDEN_FUNC(_rest32gpr_15_t)	lwz 15,-68(11)
++HIDDEN_FUNC(_rest32gpr_16_t)	lwz 16,-64(11)
++HIDDEN_FUNC(_rest32gpr_17_t)	lwz 17,-60(11)
++HIDDEN_FUNC(_rest32gpr_18_t)	lwz 18,-56(11)
++HIDDEN_FUNC(_rest32gpr_19_t)	lwz 19,-52(11)
++HIDDEN_FUNC(_rest32gpr_20_t)	lwz 20,-48(11)
++HIDDEN_FUNC(_rest32gpr_21_t)	lwz 21,-44(11)
++HIDDEN_FUNC(_rest32gpr_22_t)	lwz 22,-40(11)
++HIDDEN_FUNC(_rest32gpr_23_t)	lwz 23,-36(11)
++HIDDEN_FUNC(_rest32gpr_24_t)	lwz 24,-32(11)
++HIDDEN_FUNC(_rest32gpr_25_t)	lwz 25,-28(11)
++HIDDEN_FUNC(_rest32gpr_26_t)	lwz 26,-24(11)
++HIDDEN_FUNC(_rest32gpr_27_t)	lwz 27,-20(11)
++HIDDEN_FUNC(_rest32gpr_28_t)	lwz 28,-16(11)
++HIDDEN_FUNC(_rest32gpr_29_t)	lwz 29,-12(11)
++HIDDEN_FUNC(_rest32gpr_30_t)	lwz 30,-8(11)
++HIDDEN_FUNC(_rest32gpr_31_t)	lwz 31,-4(11)
+ 				lwz 0,4(11)
+ 				mr 1,11
+ 				blr
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtrest64gpr.asm gcc-4.3-new/gcc/config/rs6000/e500crtrest64gpr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtrest64gpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtrest64gpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -42,24 +42,24 @@
+ 
+ /* "Tail" versions that perform a tail call.  */
+ 
+-FUNC_START(_rest64gpr_14_t)	evldd 14,0(11)
+-FUNC_START(_rest64gpr_15_t)	evldd 15,8(11)
+-FUNC_START(_rest64gpr_16_t)	evldd 16,16(11)
+-FUNC_START(_rest64gpr_17_t)	evldd 17,24(11)
+-FUNC_START(_rest64gpr_18_t)	evldd 18,32(11)
+-FUNC_START(_rest64gpr_19_t)	evldd 19,40(11)
+-FUNC_START(_rest64gpr_20_t)	evldd 20,48(11)
+-FUNC_START(_rest64gpr_21_t)	evldd 21,56(11)
+-FUNC_START(_rest64gpr_22_t)	evldd 22,64(11)
+-FUNC_START(_rest64gpr_23_t)	evldd 23,72(11)
+-FUNC_START(_rest64gpr_24_t)	evldd 24,80(11)
+-FUNC_START(_rest64gpr_25_t)	evldd 25,88(11)
+-FUNC_START(_rest64gpr_26_t)	evldd 26,96(11)
+-FUNC_START(_rest64gpr_27_t)	evldd 27,104(11)
+-FUNC_START(_rest64gpr_28_t)	evldd 28,112(11)
+-FUNC_START(_rest64gpr_29_t)	evldd 29,120(11)
+-FUNC_START(_rest64gpr_30_t)	evldd 30,128(11)
+-FUNC_START(_rest64gpr_31_t)	lwz 0,148(11)
++HIDDEN_FUNC(_rest64gpr_14_t)	evldd 14,0(11)
++HIDDEN_FUNC(_rest64gpr_15_t)	evldd 15,8(11)
++HIDDEN_FUNC(_rest64gpr_16_t)	evldd 16,16(11)
++HIDDEN_FUNC(_rest64gpr_17_t)	evldd 17,24(11)
++HIDDEN_FUNC(_rest64gpr_18_t)	evldd 18,32(11)
++HIDDEN_FUNC(_rest64gpr_19_t)	evldd 19,40(11)
++HIDDEN_FUNC(_rest64gpr_20_t)	evldd 20,48(11)
++HIDDEN_FUNC(_rest64gpr_21_t)	evldd 21,56(11)
++HIDDEN_FUNC(_rest64gpr_22_t)	evldd 22,64(11)
++HIDDEN_FUNC(_rest64gpr_23_t)	evldd 23,72(11)
++HIDDEN_FUNC(_rest64gpr_24_t)	evldd 24,80(11)
++HIDDEN_FUNC(_rest64gpr_25_t)	evldd 25,88(11)
++HIDDEN_FUNC(_rest64gpr_26_t)	evldd 26,96(11)
++HIDDEN_FUNC(_rest64gpr_27_t)	evldd 27,104(11)
++HIDDEN_FUNC(_rest64gpr_28_t)	evldd 28,112(11)
++HIDDEN_FUNC(_rest64gpr_29_t)	evldd 29,120(11)
++HIDDEN_FUNC(_rest64gpr_30_t)	evldd 30,128(11)
++HIDDEN_FUNC(_rest64gpr_31_t)	lwz 0,148(11)
+ 				evldd 31,136(11)
+ 				addi 1,11,144
+ 				blr
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtresx32gpr.asm gcc-4.3-new/gcc/config/rs6000/e500crtresx32gpr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtresx32gpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtresx32gpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -43,24 +43,24 @@
+ /* Routines for restoring 32-bit integer registers, called by the compiler.  */
+ /* "Exit" versions that return to the caller's caller.  */
+ 
+-FUNC_START(_rest32gpr_14_x)	lwz 14,-72(11)
+-FUNC_START(_rest32gpr_15_x)	lwz 15,-68(11)
+-FUNC_START(_rest32gpr_16_x)	lwz 16,-64(11)
+-FUNC_START(_rest32gpr_17_x)	lwz 17,-60(11)
+-FUNC_START(_rest32gpr_18_x)	lwz 18,-56(11)
+-FUNC_START(_rest32gpr_19_x)	lwz 19,-52(11)
+-FUNC_START(_rest32gpr_20_x)	lwz 20,-48(11)
+-FUNC_START(_rest32gpr_21_x)	lwz 21,-44(11)
+-FUNC_START(_rest32gpr_22_x)	lwz 22,-40(11)
+-FUNC_START(_rest32gpr_23_x)	lwz 23,-36(11)
+-FUNC_START(_rest32gpr_24_x)	lwz 24,-32(11)
+-FUNC_START(_rest32gpr_25_x)	lwz 25,-28(11)
+-FUNC_START(_rest32gpr_26_x)	lwz 26,-24(11)
+-FUNC_START(_rest32gpr_27_x)	lwz 27,-20(11)
+-FUNC_START(_rest32gpr_28_x)	lwz 28,-16(11)
+-FUNC_START(_rest32gpr_29_x)	lwz 29,-12(11)
+-FUNC_START(_rest32gpr_30_x)	lwz 30,-8(11)
+-FUNC_START(_rest32gpr_31_x)	lwz 0,4(11)
++HIDDEN_FUNC(_rest32gpr_14_x)	lwz 14,-72(11)
++HIDDEN_FUNC(_rest32gpr_15_x)	lwz 15,-68(11)
++HIDDEN_FUNC(_rest32gpr_16_x)	lwz 16,-64(11)
++HIDDEN_FUNC(_rest32gpr_17_x)	lwz 17,-60(11)
++HIDDEN_FUNC(_rest32gpr_18_x)	lwz 18,-56(11)
++HIDDEN_FUNC(_rest32gpr_19_x)	lwz 19,-52(11)
++HIDDEN_FUNC(_rest32gpr_20_x)	lwz 20,-48(11)
++HIDDEN_FUNC(_rest32gpr_21_x)	lwz 21,-44(11)
++HIDDEN_FUNC(_rest32gpr_22_x)	lwz 22,-40(11)
++HIDDEN_FUNC(_rest32gpr_23_x)	lwz 23,-36(11)
++HIDDEN_FUNC(_rest32gpr_24_x)	lwz 24,-32(11)
++HIDDEN_FUNC(_rest32gpr_25_x)	lwz 25,-28(11)
++HIDDEN_FUNC(_rest32gpr_26_x)	lwz 26,-24(11)
++HIDDEN_FUNC(_rest32gpr_27_x)	lwz 27,-20(11)
++HIDDEN_FUNC(_rest32gpr_28_x)	lwz 28,-16(11)
++HIDDEN_FUNC(_rest32gpr_29_x)	lwz 29,-12(11)
++HIDDEN_FUNC(_rest32gpr_30_x)	lwz 30,-8(11)
++HIDDEN_FUNC(_rest32gpr_31_x)	lwz 0,4(11)
+ 				lwz 31,-4(11)
+ 				mr 1,11
+ 				mtlr 0
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtresx64gpr.asm gcc-4.3-new/gcc/config/rs6000/e500crtresx64gpr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtresx64gpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtresx64gpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -42,24 +42,24 @@
+ 
+ /* "Exit" versions that return to their caller's caller.  */
+ 
+-FUNC_START(_rest64gpr_14_x)	evldd 14,0(11)
+-FUNC_START(_rest64gpr_15_x)	evldd 15,8(11)
+-FUNC_START(_rest64gpr_16_x)	evldd 16,16(11)
+-FUNC_START(_rest64gpr_17_x)	evldd 17,24(11)
+-FUNC_START(_rest64gpr_18_x)	evldd 18,32(11)
+-FUNC_START(_rest64gpr_19_x)	evldd 19,40(11)
+-FUNC_START(_rest64gpr_20_x)	evldd 20,48(11)
+-FUNC_START(_rest64gpr_21_x)	evldd 21,56(11)
+-FUNC_START(_rest64gpr_22_x)	evldd 22,64(11)
+-FUNC_START(_rest64gpr_23_x)	evldd 23,72(11)
+-FUNC_START(_rest64gpr_24_x)	evldd 24,80(11)
+-FUNC_START(_rest64gpr_25_x)	evldd 25,88(11)
+-FUNC_START(_rest64gpr_26_x)	evldd 26,96(11)
+-FUNC_START(_rest64gpr_27_x)	evldd 27,104(11)
+-FUNC_START(_rest64gpr_28_x)	evldd 28,112(11)
+-FUNC_START(_rest64gpr_29_x)	evldd 29,120(11)
+-FUNC_START(_rest64gpr_30_x)	evldd 30,128(11)
+-FUNC_START(_rest64gpr_31_x)	lwz 0,148(11)
++HIDDEN_FUNC(_rest64gpr_14_x)	evldd 14,0(11)
++HIDDEN_FUNC(_rest64gpr_15_x)	evldd 15,8(11)
++HIDDEN_FUNC(_rest64gpr_16_x)	evldd 16,16(11)
++HIDDEN_FUNC(_rest64gpr_17_x)	evldd 17,24(11)
++HIDDEN_FUNC(_rest64gpr_18_x)	evldd 18,32(11)
++HIDDEN_FUNC(_rest64gpr_19_x)	evldd 19,40(11)
++HIDDEN_FUNC(_rest64gpr_20_x)	evldd 20,48(11)
++HIDDEN_FUNC(_rest64gpr_21_x)	evldd 21,56(11)
++HIDDEN_FUNC(_rest64gpr_22_x)	evldd 22,64(11)
++HIDDEN_FUNC(_rest64gpr_23_x)	evldd 23,72(11)
++HIDDEN_FUNC(_rest64gpr_24_x)	evldd 24,80(11)
++HIDDEN_FUNC(_rest64gpr_25_x)	evldd 25,88(11)
++HIDDEN_FUNC(_rest64gpr_26_x)	evldd 26,96(11)
++HIDDEN_FUNC(_rest64gpr_27_x)	evldd 27,104(11)
++HIDDEN_FUNC(_rest64gpr_28_x)	evldd 28,112(11)
++HIDDEN_FUNC(_rest64gpr_29_x)	evldd 29,120(11)
++HIDDEN_FUNC(_rest64gpr_30_x)	evldd 30,128(11)
++HIDDEN_FUNC(_rest64gpr_31_x)	lwz 0,148(11)
+ 				evldd 31,136(11)
+ 				addi 1,11,144
+ 				mtlr 0
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtsav32gpr.asm gcc-4.3-new/gcc/config/rs6000/e500crtsav32gpr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtsav32gpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtsav32gpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -43,24 +43,24 @@
+ /* Routines for saving 32-bit integer registers, called by the compiler.  */
+ /* "Bare" versions that simply return to their caller.  */
+ 
+-FUNC_START(_save32gpr_14)	stw 14,-72(11)
+-FUNC_START(_save32gpr_15)	stw 15,-68(11)
+-FUNC_START(_save32gpr_16)	stw 16,-64(11)
+-FUNC_START(_save32gpr_17)	stw 17,-60(11)
+-FUNC_START(_save32gpr_18)	stw 18,-56(11)
+-FUNC_START(_save32gpr_19)	stw 19,-52(11)
+-FUNC_START(_save32gpr_20)	stw 20,-48(11)
+-FUNC_START(_save32gpr_21)	stw 21,-44(11)
+-FUNC_START(_save32gpr_22)	stw 22,-40(11)
+-FUNC_START(_save32gpr_23)	stw 23,-36(11)
+-FUNC_START(_save32gpr_24)	stw 24,-32(11)
+-FUNC_START(_save32gpr_25)	stw 25,-28(11)
+-FUNC_START(_save32gpr_26)	stw 26,-24(11)
+-FUNC_START(_save32gpr_27)	stw 27,-20(11)
+-FUNC_START(_save32gpr_28)	stw 28,-16(11)
+-FUNC_START(_save32gpr_29)	stw 29,-12(11)
+-FUNC_START(_save32gpr_30)	stw 30,-8(11)
+-FUNC_START(_save32gpr_31)	stw 31,-4(11)
++HIDDEN_FUNC(_save32gpr_14)	stw 14,-72(11)
++HIDDEN_FUNC(_save32gpr_15)	stw 15,-68(11)
++HIDDEN_FUNC(_save32gpr_16)	stw 16,-64(11)
++HIDDEN_FUNC(_save32gpr_17)	stw 17,-60(11)
++HIDDEN_FUNC(_save32gpr_18)	stw 18,-56(11)
++HIDDEN_FUNC(_save32gpr_19)	stw 19,-52(11)
++HIDDEN_FUNC(_save32gpr_20)	stw 20,-48(11)
++HIDDEN_FUNC(_save32gpr_21)	stw 21,-44(11)
++HIDDEN_FUNC(_save32gpr_22)	stw 22,-40(11)
++HIDDEN_FUNC(_save32gpr_23)	stw 23,-36(11)
++HIDDEN_FUNC(_save32gpr_24)	stw 24,-32(11)
++HIDDEN_FUNC(_save32gpr_25)	stw 25,-28(11)
++HIDDEN_FUNC(_save32gpr_26)	stw 26,-24(11)
++HIDDEN_FUNC(_save32gpr_27)	stw 27,-20(11)
++HIDDEN_FUNC(_save32gpr_28)	stw 28,-16(11)
++HIDDEN_FUNC(_save32gpr_29)	stw 29,-12(11)
++HIDDEN_FUNC(_save32gpr_30)	stw 30,-8(11)
++HIDDEN_FUNC(_save32gpr_31)	stw 31,-4(11)
+ 				blr
+ FUNC_END(_save32gpr_31)
+ FUNC_END(_save32gpr_30)
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtsav64gpr.asm gcc-4.3-new/gcc/config/rs6000/e500crtsav64gpr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtsav64gpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtsav64gpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -42,24 +42,24 @@
+ 
+ /* Routines for saving 64-bit integer registers, called by the compiler.  */
+ 
+-FUNC_START(_save64gpr_14)	evstdd 14,0(11)
+-FUNC_START(_save64gpr_15)	evstdd 15,8(11)
+-FUNC_START(_save64gpr_16)	evstdd 16,16(11)
+-FUNC_START(_save64gpr_17)	evstdd 17,24(11)
+-FUNC_START(_save64gpr_18)	evstdd 18,32(11)
+-FUNC_START(_save64gpr_19)	evstdd 19,40(11)
+-FUNC_START(_save64gpr_20)	evstdd 20,48(11)
+-FUNC_START(_save64gpr_21)	evstdd 21,56(11)
+-FUNC_START(_save64gpr_22)	evstdd 22,64(11)
+-FUNC_START(_save64gpr_23)	evstdd 23,72(11)
+-FUNC_START(_save64gpr_24)	evstdd 24,80(11)
+-FUNC_START(_save64gpr_25)	evstdd 25,88(11)
+-FUNC_START(_save64gpr_26)	evstdd 26,96(11)
+-FUNC_START(_save64gpr_27)	evstdd 27,104(11)
+-FUNC_START(_save64gpr_28)	evstdd 28,112(11)
+-FUNC_START(_save64gpr_29)	evstdd 29,120(11)
+-FUNC_START(_save64gpr_30)	evstdd 30,128(11)
+-FUNC_START(_save64gpr_31)	evstdd 31,136(11)
++HIDDEN_FUNC(_save64gpr_14)	evstdd 14,0(11)
++HIDDEN_FUNC(_save64gpr_15)	evstdd 15,8(11)
++HIDDEN_FUNC(_save64gpr_16)	evstdd 16,16(11)
++HIDDEN_FUNC(_save64gpr_17)	evstdd 17,24(11)
++HIDDEN_FUNC(_save64gpr_18)	evstdd 18,32(11)
++HIDDEN_FUNC(_save64gpr_19)	evstdd 19,40(11)
++HIDDEN_FUNC(_save64gpr_20)	evstdd 20,48(11)
++HIDDEN_FUNC(_save64gpr_21)	evstdd 21,56(11)
++HIDDEN_FUNC(_save64gpr_22)	evstdd 22,64(11)
++HIDDEN_FUNC(_save64gpr_23)	evstdd 23,72(11)
++HIDDEN_FUNC(_save64gpr_24)	evstdd 24,80(11)
++HIDDEN_FUNC(_save64gpr_25)	evstdd 25,88(11)
++HIDDEN_FUNC(_save64gpr_26)	evstdd 26,96(11)
++HIDDEN_FUNC(_save64gpr_27)	evstdd 27,104(11)
++HIDDEN_FUNC(_save64gpr_28)	evstdd 28,112(11)
++HIDDEN_FUNC(_save64gpr_29)	evstdd 29,120(11)
++HIDDEN_FUNC(_save64gpr_30)	evstdd 30,128(11)
++HIDDEN_FUNC(_save64gpr_31)	evstdd 31,136(11)
+ 				blr
+ FUNC_END(_save64gpr_31)
+ FUNC_END(_save64gpr_30)
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtsav64gprctr.asm gcc-4.3-new/gcc/config/rs6000/e500crtsav64gprctr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtsav64gprctr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtsav64gprctr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -44,41 +44,41 @@
+    registers to be saved is passed in CTR, called by the compiler.  */
+ /* "Bare" versions that return to their caller.  */
+ 
+-FUNC_START(_save64gpr_ctr_14)	evstdd 14,0(11)
++HIDDEN_FUNC(_save64gpr_ctr_14)	evstdd 14,0(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_15)	evstdd 15,8(11)
++HIDDEN_FUNC(_save64gpr_ctr_15)	evstdd 15,8(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_16)	evstdd 16,16(11)
++HIDDEN_FUNC(_save64gpr_ctr_16)	evstdd 16,16(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_17)	evstdd 17,24(11)
++HIDDEN_FUNC(_save64gpr_ctr_17)	evstdd 17,24(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_18)	evstdd 18,32(11)
++HIDDEN_FUNC(_save64gpr_ctr_18)	evstdd 18,32(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_19)	evstdd 19,40(11)
++HIDDEN_FUNC(_save64gpr_ctr_19)	evstdd 19,40(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_20)	evstdd 20,48(11)
++HIDDEN_FUNC(_save64gpr_ctr_20)	evstdd 20,48(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_21)	evstdd 21,56(11)
++HIDDEN_FUNC(_save64gpr_ctr_21)	evstdd 21,56(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_22)	evstdd 22,64(11)
++HIDDEN_FUNC(_save64gpr_ctr_22)	evstdd 22,64(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_23)	evstdd 23,72(11)
++HIDDEN_FUNC(_save64gpr_ctr_23)	evstdd 23,72(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_24)	evstdd 24,80(11)
++HIDDEN_FUNC(_save64gpr_ctr_24)	evstdd 24,80(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_25)	evstdd 25,88(11)
++HIDDEN_FUNC(_save64gpr_ctr_25)	evstdd 25,88(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_26)	evstdd 26,96(11)
++HIDDEN_FUNC(_save64gpr_ctr_26)	evstdd 26,96(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_27)	evstdd 27,104(11)
++HIDDEN_FUNC(_save64gpr_ctr_27)	evstdd 27,104(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_28)	evstdd 28,112(11)
++HIDDEN_FUNC(_save64gpr_ctr_28)	evstdd 28,112(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_29)	evstdd 29,120(11)
++HIDDEN_FUNC(_save64gpr_ctr_29)	evstdd 29,120(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_30)	evstdd 30,128(11)
++HIDDEN_FUNC(_save64gpr_ctr_30)	evstdd 30,128(11)
+ 				bdz _save64_gpr_ctr_done
+-FUNC_START(_save64gpr_ctr_31)	evstdd 31,136(11)
++HIDDEN_FUNC(_save64gpr_ctr_31)	evstdd 31,136(11)
+ _save64gpr_ctr_done:		blr
+ FUNC_END(_save64gpr_ctr_31)
+ FUNC_END(_save64gpr_ctr_30)
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtsavg32gpr.asm gcc-4.3-new/gcc/config/rs6000/e500crtsavg32gpr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtsavg32gpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtsavg32gpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -43,24 +43,24 @@
+ /* Routines for saving 32-bit integer registers, called by the compiler.  */
+ /* "GOT" versions that load the address of the GOT into lr before returning.  */
+ 
+-FUNC_START(_save32gpr_14_g)	stw 14,-72(11)
+-FUNC_START(_save32gpr_15_g)	stw 15,-68(11)
+-FUNC_START(_save32gpr_16_g)	stw 16,-64(11)
+-FUNC_START(_save32gpr_17_g)	stw 17,-60(11)
+-FUNC_START(_save32gpr_18_g)	stw 18,-56(11)
+-FUNC_START(_save32gpr_19_g)	stw 19,-52(11)
+-FUNC_START(_save32gpr_20_g)	stw 20,-48(11)
+-FUNC_START(_save32gpr_21_g)	stw 21,-44(11)
+-FUNC_START(_save32gpr_22_g)	stw 22,-40(11)
+-FUNC_START(_save32gpr_23_g)	stw 23,-36(11)
+-FUNC_START(_save32gpr_24_g)	stw 24,-32(11)
+-FUNC_START(_save32gpr_25_g)	stw 25,-28(11)
+-FUNC_START(_save32gpr_26_g)	stw 26,-24(11)
+-FUNC_START(_save32gpr_27_g)	stw 27,-20(11)
+-FUNC_START(_save32gpr_28_g)	stw 28,-16(11)
+-FUNC_START(_save32gpr_29_g)	stw 29,-12(11)
+-FUNC_START(_save32gpr_30_g)	stw 30,-8(11)
+-FUNC_START(_save32gpr_31_g)	stw 31,-4(11)
++HIDDEN_FUNC(_save32gpr_14_g)	stw 14,-72(11)
++HIDDEN_FUNC(_save32gpr_15_g)	stw 15,-68(11)
++HIDDEN_FUNC(_save32gpr_16_g)	stw 16,-64(11)
++HIDDEN_FUNC(_save32gpr_17_g)	stw 17,-60(11)
++HIDDEN_FUNC(_save32gpr_18_g)	stw 18,-56(11)
++HIDDEN_FUNC(_save32gpr_19_g)	stw 19,-52(11)
++HIDDEN_FUNC(_save32gpr_20_g)	stw 20,-48(11)
++HIDDEN_FUNC(_save32gpr_21_g)	stw 21,-44(11)
++HIDDEN_FUNC(_save32gpr_22_g)	stw 22,-40(11)
++HIDDEN_FUNC(_save32gpr_23_g)	stw 23,-36(11)
++HIDDEN_FUNC(_save32gpr_24_g)	stw 24,-32(11)
++HIDDEN_FUNC(_save32gpr_25_g)	stw 25,-28(11)
++HIDDEN_FUNC(_save32gpr_26_g)	stw 26,-24(11)
++HIDDEN_FUNC(_save32gpr_27_g)	stw 27,-20(11)
++HIDDEN_FUNC(_save32gpr_28_g)	stw 28,-16(11)
++HIDDEN_FUNC(_save32gpr_29_g)	stw 29,-12(11)
++HIDDEN_FUNC(_save32gpr_30_g)	stw 30,-8(11)
++HIDDEN_FUNC(_save32gpr_31_g)	stw 31,-4(11)
+ 				b _GLOBAL_OFFSET_TABLE_-4
+ FUNC_END(_save32gpr_31_g)
+ FUNC_END(_save32gpr_30_g)
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtsavg64gpr.asm gcc-4.3-new/gcc/config/rs6000/e500crtsavg64gpr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtsavg64gpr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtsavg64gpr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -43,24 +43,24 @@
+ /* Routines for saving 64-bit integer registers, called by the compiler.  */
+ /* "GOT" versions that load the address of the GOT into lr before returning.  */
+ 
+-FUNC_START(_save64gpr_14_g)	evstdd 14,0(11)
+-FUNC_START(_save64gpr_15_g)	evstdd 15,8(11)
+-FUNC_START(_save64gpr_16_g)	evstdd 16,16(11)
+-FUNC_START(_save64gpr_17_g)	evstdd 17,24(11)
+-FUNC_START(_save64gpr_18_g)	evstdd 18,32(11)
+-FUNC_START(_save64gpr_19_g)	evstdd 19,40(11)
+-FUNC_START(_save64gpr_20_g)	evstdd 20,48(11)
+-FUNC_START(_save64gpr_21_g)	evstdd 21,56(11)
+-FUNC_START(_save64gpr_22_g)	evstdd 22,64(11)
+-FUNC_START(_save64gpr_23_g)	evstdd 23,72(11)
+-FUNC_START(_save64gpr_24_g)	evstdd 24,80(11)
+-FUNC_START(_save64gpr_25_g)	evstdd 25,88(11)
+-FUNC_START(_save64gpr_26_g)	evstdd 26,96(11)
+-FUNC_START(_save64gpr_27_g)	evstdd 27,104(11)
+-FUNC_START(_save64gpr_28_g)	evstdd 28,112(11)
+-FUNC_START(_save64gpr_29_g)	evstdd 29,120(11)
+-FUNC_START(_save64gpr_30_g)	evstdd 30,128(11)
+-FUNC_START(_save64gpr_31_g)	evstdd 31,136(11)
++HIDDEN_FUNC(_save64gpr_14_g)	evstdd 14,0(11)
++HIDDEN_FUNC(_save64gpr_15_g)	evstdd 15,8(11)
++HIDDEN_FUNC(_save64gpr_16_g)	evstdd 16,16(11)
++HIDDEN_FUNC(_save64gpr_17_g)	evstdd 17,24(11)
++HIDDEN_FUNC(_save64gpr_18_g)	evstdd 18,32(11)
++HIDDEN_FUNC(_save64gpr_19_g)	evstdd 19,40(11)
++HIDDEN_FUNC(_save64gpr_20_g)	evstdd 20,48(11)
++HIDDEN_FUNC(_save64gpr_21_g)	evstdd 21,56(11)
++HIDDEN_FUNC(_save64gpr_22_g)	evstdd 22,64(11)
++HIDDEN_FUNC(_save64gpr_23_g)	evstdd 23,72(11)
++HIDDEN_FUNC(_save64gpr_24_g)	evstdd 24,80(11)
++HIDDEN_FUNC(_save64gpr_25_g)	evstdd 25,88(11)
++HIDDEN_FUNC(_save64gpr_26_g)	evstdd 26,96(11)
++HIDDEN_FUNC(_save64gpr_27_g)	evstdd 27,104(11)
++HIDDEN_FUNC(_save64gpr_28_g)	evstdd 28,112(11)
++HIDDEN_FUNC(_save64gpr_29_g)	evstdd 29,120(11)
++HIDDEN_FUNC(_save64gpr_30_g)	evstdd 30,128(11)
++HIDDEN_FUNC(_save64gpr_31_g)	evstdd 31,136(11)
+ 				b _GLOBAL_OFFSET_TABLE_-4
+ FUNC_END(_save64gpr_31_g)
+ FUNC_END(_save64gpr_30_g)
+diff -Nurd gcc-4.3/gcc/config/rs6000/e500crtsavg64gprctr.asm gcc-4.3-new/gcc/config/rs6000/e500crtsavg64gprctr.asm
+--- gcc-4.3/gcc/config/rs6000/e500crtsavg64gprctr.asm	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/e500crtsavg64gprctr.asm	2008-10-18 12:44:16.000000000 +0200
+@@ -43,41 +43,41 @@
+ /* Routines for saving 64-bit integer registers, called by the compiler.  */
+ /* "GOT" versions that load the address of the GOT into lr before returning.  */
+ 
+-FUNC_START(_save64gpr_ctr_14_g)	evstdd 14,0(11)
++HIDDEN_FUNC(_save64gpr_ctr_14_g)	evstdd 14,0(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_15_g)	evstdd 15,8(11)
++HIDDEN_FUNC(_save64gpr_ctr_15_g)	evstdd 15,8(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_16_g)	evstdd 16,16(11)
++HIDDEN_FUNC(_save64gpr_ctr_16_g)	evstdd 16,16(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_17_g)	evstdd 17,24(11)
++HIDDEN_FUNC(_save64gpr_ctr_17_g)	evstdd 17,24(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_18_g)	evstdd 18,32(11)
++HIDDEN_FUNC(_save64gpr_ctr_18_g)	evstdd 18,32(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_19_g)	evstdd 19,40(11)
++HIDDEN_FUNC(_save64gpr_ctr_19_g)	evstdd 19,40(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_20_g)	evstdd 20,48(11)
++HIDDEN_FUNC(_save64gpr_ctr_20_g)	evstdd 20,48(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_21_g)	evstdd 21,56(11)
++HIDDEN_FUNC(_save64gpr_ctr_21_g)	evstdd 21,56(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_22_g)	evstdd 22,64(11)
++HIDDEN_FUNC(_save64gpr_ctr_22_g)	evstdd 22,64(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_23_g)	evstdd 23,72(11)
++HIDDEN_FUNC(_save64gpr_ctr_23_g)	evstdd 23,72(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_24_g)	evstdd 24,80(11)
++HIDDEN_FUNC(_save64gpr_ctr_24_g)	evstdd 24,80(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_25_g)	evstdd 25,88(11)
++HIDDEN_FUNC(_save64gpr_ctr_25_g)	evstdd 25,88(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_26_g)	evstdd 26,96(11)
++HIDDEN_FUNC(_save64gpr_ctr_26_g)	evstdd 26,96(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_27_g)	evstdd 27,104(11)
++HIDDEN_FUNC(_save64gpr_ctr_27_g)	evstdd 27,104(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_28_g)	evstdd 28,112(11)
++HIDDEN_FUNC(_save64gpr_ctr_28_g)	evstdd 28,112(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_29_g)	evstdd 29,120(11)
++HIDDEN_FUNC(_save64gpr_ctr_29_g)	evstdd 29,120(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_30_g)	evstdd 30,128(11)
++HIDDEN_FUNC(_save64gpr_ctr_30_g)	evstdd 30,128(11)
+ 				bdz _save64_gpr_ctr_g_done
+-FUNC_START(_save64gpr_ctr_31_g)	evstdd 31,136(11)
++HIDDEN_FUNC(_save64gpr_ctr_31_g)	evstdd 31,136(11)
+ _save64gpr_ctr_g_done:		b _GLOBAL_OFFSET_TABLE_-4
+ FUNC_END(_save64gpr_ctr_31_g)
+ FUNC_END(_save64gpr_ctr_30_g)
+diff -Nurd gcc-4.3/gcc/config/rs6000/ppc-asm.h gcc-4.3-new/gcc/config/rs6000/ppc-asm.h
+--- gcc-4.3/gcc/config/rs6000/ppc-asm.h	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/ppc-asm.h	2008-10-18 12:44:16.000000000 +0200
+@@ -110,6 +110,11 @@
+ 	.globl GLUE(.,name); \
+ GLUE(.,name):
+ 
++#define HIDDEN_FUNC(name) \
++  FUNC_START(name) \
++  .hidden name;	\
++  .hidden GLUE(.,name);
++
+ #define FUNC_END(name) \
+ GLUE(.L,name): \
+ 	.size GLUE(.,name),GLUE(.L,name)-GLUE(.,name)
+@@ -136,6 +141,11 @@
+ 	.globl GLUE(.,name); \
+ GLUE(.,name):
+ 
++#define HIDDEN_FUNC(name) \
++  FUNC_START(name) \
++  .hidden name; \
++  .hidden GLUE(.,name);
++
+ #define FUNC_END(name) \
+ GLUE(.L,name): \
+ 	.size GLUE(.,name),GLUE(.L,name)-GLUE(.,name)
+@@ -153,6 +163,10 @@
+ 	.globl FUNC_NAME(name); \
+ FUNC_NAME(name):
+ 
++#define HIDDEN_FUNC(name) \
++  FUNC_START(name) \
++  .hidden FUNC_NAME(name);
++
+ #define FUNC_END(name) \
+ GLUE(.L,name): \
+ 	.size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
+diff -Nurd gcc-4.3/gcc/config/rs6000/rs6000.c gcc-4.3-new/gcc/config/rs6000/rs6000.c
+--- gcc-4.3/gcc/config/rs6000/rs6000.c	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/rs6000.c	2008-10-18 12:44:16.000000000 +0200
+@@ -2476,6 +2476,8 @@
+ 	       (TARGET_ALTIVEC_ABI ? 2
+ 		: TARGET_SPE_ABI ? 3
+ 		: 1));
++      fprintf (file, "\t.gnu_attribute 12, %d\n",
++	       aix_struct_return ? 2 : 1);
+     }
+ #endif
+ 
+diff -Nurd gcc-4.3/gcc/config/rs6000/sysv4.h gcc-4.3-new/gcc/config/rs6000/sysv4.h
+--- gcc-4.3/gcc/config/rs6000/sysv4.h	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/sysv4.h	2008-10-18 12:44:16.000000000 +0200
+@@ -585,9 +585,9 @@
+ /* Override svr4.h definition.  */
+ #undef	ASM_SPEC
+ #define	ASM_SPEC "%(asm_cpu) \
+-%{,assembler|,assembler-with-cpp: %{mregnames} %{mno-regnames}} \
+-%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*} \
+-%{mrelocatable} %{mrelocatable-lib} %{fpic|fpie|fPIC|fPIE:-K PIC} \
++%{,assembler|,assembler-with-cpp: %{mregnames} %{mno-regnames}}" \
++SVR4_ASM_SPEC \
++"%{mrelocatable} %{mrelocatable-lib} %{fpic|fpie|fPIC|fPIE:-K PIC} \
+ %{memb|msdata|msdata=eabi: -memb} \
+ %{mlittle|mlittle-endian:-mlittle; \
+   mbig|mbig-endian      :-mbig;    \
+diff -Nurd gcc-4.3/gcc/config/rs6000/t-cs-eabi gcc-4.3-new/gcc/config/rs6000/t-cs-eabi
+--- gcc-4.3/gcc/config/rs6000/t-cs-eabi	1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.3-new/gcc/config/rs6000/t-cs-eabi	2008-10-18 12:44:16.000000000 +0200
+@@ -0,0 +1,17 @@
++# Multilibs for powerpc embedded ELF targets.
++
++MULTILIB_OPTIONS	= te500v1/te500v2/te600/te500mc \
++			  msoft-float
++
++MULTILIB_DIRNAMES	= te500v1 te500v2 te600 te500mc \
++			  nof
++
++MULTILIB_EXCEPTIONS	= *te600*/*msoft-float* \
++			  *te500v1*/*msoft-float* \
++			  *te500v2*/*msoft-float* \
++			  *te500mc*/*msoft-float*
++
++MULTILIB_EXTRA_OPTS	= mno-eabi mstrict-align
++
++MULTILIB_MATCHES	= ${MULTILIB_MATCHES_FLOAT} \
++			  ${MULTILIB_MATCHES_ENDIAN}
+diff -Nurd gcc-4.3/gcc/config/rs6000/t-ppcgas gcc-4.3-new/gcc/config/rs6000/t-ppcgas
+--- gcc-4.3/gcc/config/rs6000/t-ppcgas	2008-10-01 14:50:54.000000000 +0200
++++ gcc-4.3-new/gcc/config/rs6000/t-ppcgas	2008-10-18 12:44:16.000000000 +0200
+@@ -1,15 +1,14 @@
+ # Multilibs for powerpc embedded ELF targets.
+ 
+-MULTILIB_OPTIONS	= te500v1/te500v2/te600/te500mc \
++MULTILIB_OPTIONS	= te500v1/te500v2/te600 \
+ 			  msoft-float
+ 
+-MULTILIB_DIRNAMES	= te500v1 te500v2 te600 te500mc \
++MULTILIB_DIRNAMES	= te500v1 te500v2 te600 \
+ 			  nof
+ 
+ MULTILIB_EXCEPTIONS	= *te600*/*msoft-float* \
+ 			  *te500v1*/*msoft-float* \
+-			  *te500v2*/*msoft-float* \
+-			  *te500mc*/*msoft-float*
++			  *te500v2*/*msoft-float*
+ 
+ MULTILIB_EXTRA_OPTS	= mno-eabi mstrict-align
+ 
+diff -Nurd gcc-4.3/gcc/config/svr4.h gcc-4.3-new/gcc/config/svr4.h
+--- gcc-4.3/gcc/config/svr4.h	2008-10-01 14:51:13.000000000 +0200
++++ gcc-4.3-new/gcc/config/svr4.h	2008-10-18 12:45:26.000000000 +0200
+@@ -55,7 +55,8 @@
+   && strcmp (STR, "Tdata") && strcmp (STR, "Ttext")	\
+   && strcmp (STR, "Tbss"))
+ 
+-/* Provide an ASM_SPEC appropriate for svr4.  Here we try to support as
++/* Provide an ASM_SPEC appropriate for svr4.
++   If we're not using GAS, we try to support as
+    many of the specialized svr4 assembler options as seems reasonable,
+    given that there are certain options which we can't (or shouldn't)
+    support directly due to the fact that they conflict with other options
+@@ -74,9 +75,16 @@
+    read its stdin.
+ */
+ 
+-#undef  ASM_SPEC
+-#define ASM_SPEC \
++#ifdef USE_GAS
++#define SVR4_ASM_SPEC \
++  "%{v:-V} %{Wa,*:%*}"
++#else
++#define SVR4_ASM_SPEC \
+   "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*}"
++#endif
++
++#undef  ASM_SPEC
++#define ASM_SPEC SVR4_ASM_SPEC
+ 
+ #define AS_NEEDS_DASH_FOR_PIPED_INPUT
+ 
+diff -Nurd gcc-4.3/gcc/config.gcc gcc-4.3-new/gcc/config.gcc
+--- gcc-4.3/gcc/config.gcc	2008-10-01 14:51:16.000000000 +0200
++++ gcc-4.3-new/gcc/config.gcc	2008-10-18 12:45:36.000000000 +0200
+@@ -2027,12 +2027,12 @@
+ 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
+ 	;;
+ powerpc-*-eabisim*)
+-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
++	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+ 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+ 	;;
+ powerpc-*-elf*)
+-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
++	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+ 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+ 	use_fixproto=yes
+@@ -2043,9 +2043,12 @@
+ 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
+ 	;;
+ powerpc-*-eabi*)
+-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h"
++	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+ 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
++	if test x$enable_extra_sgxx_multilibs = xyes; then
++	  tmake_file="${tmake_file} rs6000/t-cs-eabi"
++	fi
+ 	;;
+ powerpc-*-rtems*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/rtems.h rtems.h"
+@@ -2132,7 +2135,7 @@
+ 	esac
+ 	;;
+ powerpc-wrs-windiss*)  # Instruction-level simulator for VxWorks.
+-	tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/windiss.h"
++	tm_file="${tm_file} elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/windiss.h"
+ 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+ 	thread_file=""
+@@ -2156,28 +2159,28 @@
+ 	use_fixproto=yes
+ 	;;
+ powerpcle-*-elf*)
+-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
++	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
+ 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+ 	use_fixproto=yes
+ 	;;
+ powerpcle-*-eabisim*)
+-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
++	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
+ 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+ 	;;
+ powerpcle-*-eabi*)
+-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h"
++	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h"
+ 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+ 	;;
+ powerpc-*-kaos*)
+-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h kaos.h rs6000/kaos-ppc.h"
++	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h kaos.h rs6000/kaos-ppc.h"
+ 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+ 	;;
+ powerpcle-*-kaos*)
+-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h kaos.h rs6000/kaos-ppc.h"
++	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h kaos.h rs6000/kaos-ppc.h"
+ 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+ 	;;
+diff -Nurd gcc-4.3/gcc/doc/invoke.texi gcc-4.3-new/gcc/doc/invoke.texi
+--- gcc-4.3/gcc/doc/invoke.texi	2008-10-01 14:39:48.000000000 +0200
++++ gcc-4.3-new/gcc/doc/invoke.texi	2008-10-18 12:02:55.000000000 +0200
+@@ -389,7 +389,7 @@
+ @gccoptlist{@var{object-file-name}  -l@var{library} @gol
+ -nostartfiles  -nodefaultlibs  -nostdlib -pie -rdynamic @gol
+ -s  -static  -static-libgcc  -shared  -shared-libgcc  -symbolic @gol
+--Wl,@var{option}  -Xlinker @var{option} @gol
++-T @var{script}  -Wl,@var{option}  -Xlinker @var{option} @gol
+ -u @var{symbol}}
+ 
+ @item Directory Options
+@@ -7619,6 +7619,14 @@
+ option @samp{-Xlinker -z -Xlinker defs}).  Only a few systems support
+ this option.
+ 
++@item -T @var{script}
++@opindex T
++@cindex linker script
++Use @var{script} as the linker script.  This option is supported by most
++systems using the GNU linker.  On some targets, such as bare-board
++targets without an operating system, the @option{-T} option may be required 
++when linking to avoid references to undefined symbols.
++
+ @item -Xlinker @var{option}
+ @opindex Xlinker
+ Pass @var{option} as an option to the linker.  You can use this to
+@@ -11971,6 +11979,7 @@
+ @samp{24kec}, @samp{24kef2_1}, @samp{24kef1_1},
+ @samp{34kc}, @samp{34kf2_1}, @samp{34kf1_1},
+ @samp{74kc}, @samp{74kf2_1}, @samp{74kf1_1}, @samp{74kf3_2},
++@samp{ice9},
+ @samp{m4k},
+ @samp{orion},
+ @samp{r2000}, @samp{r3000}, @samp{r3900}, @samp{r4000}, @samp{r4400},
+@@ -13600,12 +13609,11 @@
+ On System V.4 and embedded PowerPC systems do (do not) adhere to the
+ Embedded Applications Binary Interface (eabi) which is a set of
+ modifications to the System V.4 specifications.  Selecting @option{-meabi}
+-means that the stack is aligned to an 8 byte boundary, a function
+-@code{__eabi} is called to from @code{main} to set up the eabi
+-environment, and the @option{-msdata} option can use both @code{r2} and
++means that the stack is aligned to an 8 byte boundary,
++and the @option{-msdata} option can use both @code{r2} and
+ @code{r13} to point to two separate small data areas.  Selecting
+ @option{-mno-eabi} means that the stack is aligned to a 16 byte boundary,
+-do not call an initialization function from @code{main}, and the
++and the
+ @option{-msdata} option will only use @code{r13} to point to a single
+ small data area.  The @option{-meabi} option is on by default if you
+ configured GCC using one of the @samp{powerpc*-*-eabi*} options.
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.dg/arm-mmx-1.c gcc-4.3-new/gcc/testsuite/gcc.dg/arm-mmx-1.c
+--- gcc-4.3/gcc/testsuite/gcc.dg/arm-mmx-1.c	2008-10-01 14:44:19.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.dg/arm-mmx-1.c	2008-10-18 12:19:00.000000000 +0200
+@@ -7,6 +7,7 @@
+ /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=iwmmxt" } } */
+ /* { dg-options "-O -mno-apcs-frame -mcpu=iwmmxt -mabi=iwmmxt" } */
+ /* { dg-require-effective-target arm32 } */
++/* { dg-require-effective-target arm_iwmmxt_ok } */
+ /* { dg-final { scan-assembler "ldmfd\[ 	]sp!.*ip,\[ ]*pc" } } */
+ 
+ /* This function uses all the call-saved registers, namely r4, r5, r6,
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.dg/format/cmn-err-1.c gcc-4.3-new/gcc/testsuite/gcc.dg/format/cmn-err-1.c
+--- gcc-4.3/gcc/testsuite/gcc.dg/format/cmn-err-1.c	2008-10-01 14:44:18.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.dg/format/cmn-err-1.c	2008-10-18 12:18:58.000000000 +0200
+@@ -27,12 +27,12 @@
+   cmn_err_func (0, "%p", string);
+   cmn_err_func (0, "%16b", i, "\01Foo");
+ 
+-  cmn_err_func (0, "%i", i);		/* { dg-error "unknown|too many" } */
+-  cmn_err_func (0, "%d", l);		/* { dg-error "expects type" } */
+-  cmn_err_func (0, "%b");		/* { dg-error "too few" } */
+-  cmn_err_func (0, "%b", i);		/* { dg-error "too few" } */
+-  cmn_err_func (0, "%b", i, i);		/* { dg-error "expects type" } */
+-  cmn_err_func (0, "%b", string, i);	/* { dg-error "expects type" } */
+-  cmn_err_func (0, "%p", 3);            /* { dg-error "expects type" } */
++  cmn_err_func (0, "%i", i);		/* { dg-warning "unknown|too many" } */
++  cmn_err_func (0, "%d", l);		/* { dg-warning "expects type" } */
++  cmn_err_func (0, "%b");		/* { dg-warning "too few" } */
++  cmn_err_func (0, "%b", i);		/* { dg-warning "too few" } */
++  cmn_err_func (0, "%b", i, i);		/* { dg-warning "expects type" } */
++  cmn_err_func (0, "%b", string, i);	/* { dg-warning "expects type" } */
++  cmn_err_func (0, "%p", 3);		/* { dg-warning "expects type" } */
+   return 0;
+ }
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.dg/pragma-align-2.c gcc-4.3-new/gcc/testsuite/gcc.dg/pragma-align-2.c
+--- gcc-4.3/gcc/testsuite/gcc.dg/pragma-align-2.c	2008-10-01 14:44:19.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.dg/pragma-align-2.c	2008-10-18 12:19:00.000000000 +0200
+@@ -19,15 +19,15 @@
+ 
+ #pragma align 8(not_defined)
+ 
+-#pragma align 9(odd_align)	/* { dg-error "invalid alignment" } */
+-#pragma align 256(high_align)	/* { dg-error "invalid alignment" } */
+-#pragma align -1(neg_align)	/* { dg-error "malformed" } */
+-#pragma align bad_align		/* { dg-error "malformed" } */
+-#pragma align 1(bad_align	/* { dg-error "malformed" } */
++#pragma align 9(odd_align)	/* { dg-warning "invalid alignment" } */
++#pragma align 256(high_align)	/* { dg-warning "invalid alignment" } */
++#pragma align -1(neg_align)	/* { dg-warning "malformed" } */
++#pragma align bad_align		/* { dg-warning "malformed" } */
++#pragma align 1(bad_align	/* { dg-warning "malformed" } */
+ 
+ int x, x1, x2, x4, x8, y8, z8, x16, x32, x64, x128, y128, z128;
+ 
+-#pragma align 16(x)		/* { dg-error "must appear before" } */
++#pragma align 16(x)		/* { dg-warning "must appear before" } */
+ 
+ int
+ main ()
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.dg/pragma-init-fini.c gcc-4.3-new/gcc/testsuite/gcc.dg/pragma-init-fini.c
+--- gcc-4.3/gcc/testsuite/gcc.dg/pragma-init-fini.c	2008-10-01 14:44:19.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.dg/pragma-init-fini.c	2008-10-18 12:19:00.000000000 +0200
+@@ -4,13 +4,13 @@
+ 
+ extern void abort ();
+ 
+-#pragma init		/* { dg-error "malformed" } */
+-#pragma init ()		/* { dg-error "malformed" } */
+-#pragma init init_func	/* { dg-error "malformed" } */
++#pragma init		/* { dg-warning "malformed" } */
++#pragma init ()		/* { dg-warning "malformed" } */
++#pragma init init_func	/* { dg-warning "malformed" } */
+ 
+-#pragma fini		/* { dg-error "malformed" } */
+-#pragma fini ()		/* { dg-error "malformed" } */
+-#pragma fini fini_func	/* { dg-error "malformed" } */
++#pragma fini		/* { dg-warning "malformed" } */
++#pragma fini ()		/* { dg-warning "malformed" } */
++#pragma fini fini_func	/* { dg-warning "malformed" } */
+ 
+ #pragma init (init_func, init_static_func)
+ 
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/fix-ice9a-1.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/fix-ice9a-1.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/fix-ice9a-1.c	2008-10-01 14:42:02.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/fix-ice9a-1.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,6 +1,7 @@
+ /* Check that nops are inserted before and after the fp operations.  */
+ /* { dg-do compile } */
+ /* { dg-options "-mfix-ice9a -O3" } */
++/* { dg-mips-options "-mhard-float" } */
+ 
+ typedef double TYPE;
+ #include "fix-ice9a.h"
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/fix-ice9a-2.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/fix-ice9a-2.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/fix-ice9a-2.c	2008-10-01 14:42:02.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/fix-ice9a-2.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,6 +1,7 @@
+ /* Check that nops are inserted before and after the fp operations.  */
+ /* { dg-do compile } */
+ /* { dg-options "-mfix-ice9a -O3" } */
++/* { dg-mips-options "-mhard-float" } */
+ 
+ typedef float TYPE;
+ #include "fix-ice9a.h"
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/lazy-binding-1.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/lazy-binding-1.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/lazy-binding-1.c	2008-10-01 14:42:02.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/lazy-binding-1.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* { dg-do compile { target nomips16 } } */
+-/* { dg-mips-options "-mabicalls -mshared -mexplicit-relocs -O2 -fno-delayed-branch" } */
++/* { dg-mips-options "-mabicalls -mshared -mexplicit-relocs -O2 -fno-delayed-branch -fpic" } */
+ 
+ void bar (void);
+ 
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-18.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-18.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-18.c	2008-10-01 14:42:02.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-18.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,4 +1,4 @@
+ /* Check the *extendhisi2_hw pattern.  */
+-/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32" } */
++/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32 -mno-abicalls" } */
+ unsigned int f1 (unsigned int x) { return (short) x; }
+ /* { dg-final { scan-assembler "\tjr?\t\\\$31\n\tseh\t\\\$2,\\\$4\n" } } */
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-19.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-19.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-19.c	2008-10-01 14:42:01.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-19.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,4 +1,4 @@
+ /* Check the *extendqisi2_hw pattern.  */
+-/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32" } */
++/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32 -mno-abicalls" } */
+ unsigned int f1 (unsigned int x) { return (signed char) x; }
+ /* { dg-final { scan-assembler "\tjr?\t\\\$31\n\tseb\t\\\$2,\\\$4\n" } } */
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-1.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-1.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-1.c	2008-10-01 14:42:02.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-1.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,4 +1,4 @@
+ /* Check the *baddu_si pattern.  */
+-/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32 -meb" } */
++/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32 -meb -mno-abicalls" } */
+ unsigned int f1 (unsigned int x, unsigned int y) { return (x + y) & 0xff; }
+ /* { dg-final { scan-assembler "\tjr?\t\\\$31\n\tbaddu\t\\\$2,\\\$\[45\],\\\$\[45\]\n" } } */
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-23.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-23.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-23.c	2008-10-01 14:42:02.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-23.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* Check the extzvsi pattern.  */
+-/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32" } */
++/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32 -mno-abicalls" } */
+ #ifdef _MIPSEB
+ struct s1 { unsigned int x1 : 3, x2 : 10; };
+ struct s2 { unsigned int x1 : 5, x2 : 14; };
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-28.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-28.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-28.c	2008-10-01 14:42:01.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-28.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* Check the extvsi pattern.  */
+-/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32" } */
++/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32 -mno-abicalls" } */
+ #ifdef _MIPSEB
+ struct s1 { int x1 : 3, x2 : 10; };
+ struct s2 { int x1 : 5, x2 : 14; };
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-34.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-34.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-34.c	2008-10-01 14:42:02.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-34.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* Check the insvsi pattern.  */
+-/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32 -fno-tree-sra" } */
++/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mno-abicalls -mgp32 -fno-tree-sra" } */
+ #ifdef _MIPSEB
+ struct s1 { unsigned int x1 : 3, x2 : 20; };
+ struct s2 { unsigned int x1 : 5, x2 : 10; };
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-37.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-37.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-37.c	2008-10-01 14:42:01.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-37.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* Check the mov_u[ls]w patterns.  */
+-/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32 -mocteon-useun -meb" } */
++/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mno-abi-calls -mgp32 -mocteon-useun -meb" } */
+ struct __attribute__((packed)) s { unsigned int x; };
+ unsigned int f1 (struct s *s) { return s[0].x; };
+ void f2 (struct s *s, unsigned long x) { s[10].x = x; }
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-43.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-43.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-43.c	2008-10-01 14:42:02.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-43.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* Check the *branch_bit pattern.  */
+-/* { dg-mips-options "-march=octeon -Os -mabi=eabi -mgp32" } */
++/* { dg-mips-options "-march=octeon -mno-abicalls -Os -mabi=eabi -mgp32" } */
+ int foo (void);
+ int f1 (unsigned int x) { if (x & (1UL << 30)) foo (); return 1; }
+ int f2 (unsigned int x) { if (x & (1UL << 1)) foo (); return 1; }
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-44.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-44.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-44.c	2008-10-01 14:42:02.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-44.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* Check the *branch_bit pattern.  */
+-/* { dg-mips-options "-march=octeon -Os -mabi=eabi -mgp32" } */
++/* { dg-mips-options "-march=octeon -Os -mabi=eabi -mgp32 -mno-abicalls" } */
+ int foo (void);
+ int f1 (unsigned int x) { if ((x & (1UL << 30)) == 0) foo (); return 1; }
+ int f2 (unsigned int x) { if ((x & (1UL << 1)) == 0) foo (); return 1; }
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-49.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-49.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-49.c	2008-10-01 14:42:01.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-49.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* Check the *seq_si_seq pattern.  */
+-/* { dg-mips-options "-march=octeon -Os -mabi=eabi -mgp32" } */
++/* { dg-mips-options "-march=octeon -Os -mabi=eabi -mgp32 -mno-abicalls" } */
+ int f1 (int x) { return x == -513; }
+ int f2 (int x) { return x == -512; }
+ int f3 (int x) { return x == -1; }
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-54.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-54.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-54.c	2008-10-01 14:42:01.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-54.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* Check the *sne_si_sne pattern.  */
+-/* { dg-mips-options "-march=octeon -Os -mabi=eabi -mgp32" } */
++/* { dg-mips-options "-march=octeon -Os -mabi=eabi -mgp32 -mno-abicalls" } */
+ int f1 (int x) { return x != -513; }
+ int f2 (int x) { return x != -512; }
+ int f3 (int x) { return x != -1; }
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-5.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-5.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-5.c	2008-10-01 14:42:02.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-5.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* Check the *baddu_si pattern.  */
+-/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32 -meb" } */
++/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32 -mno-abicalls -meb" } */
+ unsigned int
+ f1 (unsigned int x, unsigned int y)
+ { return (unsigned char) (x + y); }
+diff -Nurd gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-6.c gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-6.c
+--- gcc-4.3/gcc/testsuite/gcc.target/mips/octeon-6.c	2008-10-01 14:42:01.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/gcc.target/mips/octeon-6.c	2008-10-18 12:10:17.000000000 +0200
+@@ -1,4 +1,4 @@
+ /* Check the popcountsi2 pattern.  */
+-/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32" } */
++/* { dg-mips-options "-march=octeon -O2 -mabi=eabi -mgp32 -mno-abicalls" } */
+ unsigned int f1 (unsigned int x) { return __builtin_popcount (x); }
+ /* { dg-final { scan-assembler "\tjr?\t\\\$31\n\tpop\t\\\$2,\\\$4\n" } } */
+diff -Nurd gcc-4.3/gcc/testsuite/lib/target-supports.exp gcc-4.3-new/gcc/testsuite/lib/target-supports.exp
+--- gcc-4.3/gcc/testsuite/lib/target-supports.exp	2008-10-01 14:47:31.000000000 +0200
++++ gcc-4.3-new/gcc/testsuite/lib/target-supports.exp	2008-10-18 12:32:27.000000000 +0200
+@@ -1367,6 +1367,19 @@
+     }]
+ }
+ 
++# Return 1 if this is an ARM target supporting -mcpu=iwmmxt.
++# Some multilibs may be incompatible with this option.
++
++proc check_effective_target_arm_iwmmxt_ok { } {
++    if { [check_effective_target_arm32] } {
++	return [check_no_compiler_messages arm_iwmmxt_ok object {
++	    int dummy;
++	} "-mcpu=iwmmxt"]
++    } else {
++	return 0
++    }
++}
++
+ # Return 1 if this is a PowerPC target with floating-point registers.
+ 
+ proc check_effective_target_powerpc_fprs { } {
+diff -Nurd gcc-4.3/libgomp/config/linux/mips/futex.h gcc-4.3-new/libgomp/config/linux/mips/futex.h
+--- gcc-4.3/libgomp/config/linux/mips/futex.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.3-new/libgomp/config/linux/mips/futex.h	2008-10-18 12:02:42.000000000 +0200
+@@ -0,0 +1,75 @@
++/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
++   Contributed by Ilie Garbacea <ilie@mips.com>, Chao-ying Fu <fu@mips.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.  */
++
++/* Provide target-specific access to the futex system call.  */
++
++#include <sys/syscall.h>
++#define FUTEX_WAIT 0
++#define FUTEX_WAKE 1
++
++static inline void
++sys_futex0 (int *addr, int op, int val)
++{
++  register unsigned long __v0 asm("$2") = (unsigned long) SYS_futex;
++  register unsigned long __a0 asm("$4") = (unsigned long) addr;
++  register unsigned long __a1 asm("$5") = (unsigned long) op;
++  register unsigned long __a2 asm("$6") = (unsigned long) val;
++  register unsigned long __a3 asm("$7") = 0;
++
++  __asm volatile ("syscall"
++		  /* returns $a3 (errno), $v0 (return value) */
++		  : "=r" (__v0), "=r" (__a3)
++		  /* arguments in v0 (syscall) a0-a3 */
++		  : "r" (__v0), "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a3)
++		  /* clobbers at, v1, t0-t9, memory */
++		  : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", "$14",
++		    "$15", "$24", "$25", "memory");
++}
++
++static inline void
++futex_wait (int *addr, int val)
++{
++  sys_futex0 (addr, FUTEX_WAIT, val);
++}
++
++static inline void
++futex_wake (int *addr, int count)
++{
++  sys_futex0 (addr, FUTEX_WAKE, count);
++}
++
++static inline void
++cpu_relax (void)
++{
++  __asm volatile ("" : : : "memory");
++}
++
++static inline void
++atomic_write_barrier (void)
++{
++  __sync_synchronize ();
++}
+diff -Nurd gcc-4.3/libgomp/configure.tgt gcc-4.3-new/libgomp/configure.tgt
+--- gcc-4.3/libgomp/configure.tgt	2008-10-01 14:39:39.000000000 +0200
++++ gcc-4.3-new/libgomp/configure.tgt	2008-10-18 12:02:43.000000000 +0200
+@@ -35,6 +35,10 @@
+ 	config_path="linux/ia64 linux posix"
+ 	;;
+ 
++    mips*-*-linux*)
++	config_path="linux/mips linux posix"
++	;;
++
+     powerpc*-*-linux*)
+ 	config_path="linux/powerpc linux posix"
+ 	;;
+diff -Nurd gcc-4.3/release-notes-csl.xml gcc-4.3-new/release-notes-csl.xml
+--- gcc-4.3/release-notes-csl.xml	2008-10-01 14:56:28.000000000 +0200
++++ gcc-4.3-new/release-notes-csl.xml	2008-10-18 13:08:51.000000000 +0200
+@@ -5,6 +5,86 @@
+      relevant; it may be removed if it is relevant to all targets.
+  -->
+ 
++      <!-- UUID: a38e2a96-4845-410f-ba68-6f1091446123 -->
++      <!-- TARGET: arm* -->
++      <formalpara>
++        <title>Misaligned NEON memory accesses</title>
++        <para>
++	  A bug has been fixed that caused the compiler to use aligned
++	  NEON load/store instructions to access misaligned data when
++	  autovectorizing certain loops.  The bug affected code compiled
++	  with <option>-mfpu=neon</option> and loop vectorization enabled
++	  with <option>-O3</option> or <option>-ftree-vectorize</option>.
++	</para>
++      </formalpara>
++
++      <!-- UUID: 75802745-041d-4357-b48f-31fd30c58adc -->
++      <!-- TARGET: powerpc-* -->
++      <formalpara>
++        <title>Linker script option syntax</title>
++        <para>
++	  GCC now accepts <option>-T <replaceable>script</replaceable></option>
++	  (with whitespace before the <replaceable>script</replaceable>)
++	  as well as <option>-T<replaceable>script</replaceable></option>
++	  (with no whitespace) to specify a linker script on the command line.
++        </para>
++      </formalpara>
++
++      <!-- UUID: e4838603-bc80-40fe-add0-cb5aba3a235d -->
++      <!-- TARGET: arm*-linux* mips*-linux* i?86*-linux* -->
++      <formalpara features="openmp_addon">
++        <title>OpenMP support</title>
++        <para>
++          Support for the OpenMP application programming interface is
++	  now available in &csl_sgxx; Professional Edition.  To
++	  compile programs that use OpenMP features, use the
++	  <option>-fopenmp</option> command-line option.  For more
++	  information about using OpenMP with &csl_sgxx;, see <xref
++	  linkend="sec-openmp"/>.  For more information about the
++	  OpenMP API, see <uri>http://www.openmp.org/</uri>.
++        </para>
++      </formalpara>
++
++      <!-- UUID: 934d8fb3-d31c-4051-aad3-f85fc72e7576 -->
++      <!-- TARGET: m68k-*uclinux -->
++      <formalpara>
++        <title>Shared libraries bug fix</title>
++        <para>
++          A bug has been fixed that caused
++          <literal>Invalid instruction</literal> errors in applications
++          compiled with <option>-mid-shared-library</option> for CPUs
++          without hardware floating point.  The problem was caused by
++          incorrect linker attributes on internal compiler-generated
++          symbols in the shared library; you must rebuild both
++          the application and shared libraries to pick up the fix.
++        </para>
++      </formalpara>
++
++      <!-- UUID: 62a77a44-3f36-4d0c-aca2-eb327dce9ca0 -->
++      <!-- TARGET: powerpc-linux-gnu -->
++      <formalpara>
++        <title>Compiling dynamic libraries with <option>-Os</option></title>
++        <para>
++          A bug has been fixed that affected dynamic libraries compiled
++          with <option>-Os</option>.  The bug caused runtime errors such
++          as segmentation faults in applications using the library, as a
++          result of incorrect linker attributes on internal
++          compiler-generated symbols in the library.  You must rebuild
++          both the affected shared libraries and the applications that
++          use them to pick up this fix.
++        </para>
++      </formalpara>
++
++      <!-- UUID: 53bf0593-1f5d-4047-8e74-ad8889a3a1cb -->
++      <!-- TARGET: mips*-sicortex-* -->
++      <formalpara>
++        <title>SiCortex architecture option</title>
++        <para>
++          A new architecture option, <option>-march=ice9</option>, is
++	  now available to target the SiCortex ICE9 architecture.
++        </para>
++      </formalpara>
++
+       <!-- UUID: e2f7a383-48cd-48b3-9a7c-a157f722414f -->
+       <!-- TARGET: m68k-* -->
+       <formalpara>
diff --git a/recipes/gcc/gcc-csl-arm-2008q3/gcc-flags-for-build.patch b/recipes/gcc/gcc-csl-arm-2008q3/gcc-flags-for-build.patch
new file mode 100644
index 0000000000..044875651c
--- /dev/null
+++ b/recipes/gcc/gcc-csl-arm-2008q3/gcc-flags-for-build.patch
@@ -0,0 +1,165 @@
+Index: gcc-4.3.2/Makefile.def
+===================================================================
+--- gcc-4.3.2.orig/Makefile.def	2008-08-28 18:21:19.000000000 -0700
++++ gcc-4.3.2/Makefile.def	2008-08-28 18:21:41.000000000 -0700
+@@ -207,6 +207,7 @@
+ flags_to_pass = { flag= BISON ; };
+ flags_to_pass = { flag= CC_FOR_BUILD ; };
+ flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
++flags_to_pass = { flag= CPPFLAGS_FOR_BUILD ; };
+ flags_to_pass = { flag= CXX_FOR_BUILD ; };
+ flags_to_pass = { flag= EXPECT ; };
+ flags_to_pass = { flag= FLEX ; };
+--- /tmp/Makefile.in	2008-11-18 09:14:08.000000000 +0100
++++ gcc-4.3/gcc/Makefile.in	2008-11-18 09:14:46.000000000 +0100
+@@ -693,7 +693,7 @@
+ else
+ BUILD_LDFLAGS=
+ endif
+-BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
++BUILD_CPPFLAGS=$(INCLUDES) @BUILD_CPPFLAGS@ $(X_CPPFLAGS)
+ 
+ # Actual name to use when installing a native compiler.
+ GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
+Index: gcc-4.3.2/configure
+===================================================================
+Index: gcc-4.3.2/configure.ac
+===================================================================
+--- gcc-4.3.2.orig/configure.ac	2008-08-28 18:21:20.000000000 -0700
++++ gcc-4.3.2/configure.ac	2008-08-28 18:21:41.000000000 -0700
+@@ -2425,6 +2425,7 @@
+ # our build compiler if desired.
+ if test x"${build}" = x"${host}" ; then
+   CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
++  CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
+   CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
+   LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
+ fi
+@@ -2489,6 +2490,7 @@
+ AC_SUBST(AS_FOR_BUILD)
+ AC_SUBST(CC_FOR_BUILD)
+ AC_SUBST(CFLAGS_FOR_BUILD)
++AC_SUBST(CPPFLAGS_FOR_BUILD)
+ AC_SUBST(CXXFLAGS_FOR_BUILD)
+ AC_SUBST(CXX_FOR_BUILD)
+ AC_SUBST(DLLTOOL_FOR_BUILD)
+Index: gcc-4.3.2/Makefile.in
+===================================================================
+--- gcc-4.3.2.orig/Makefile.in	2008-08-28 18:21:20.000000000 -0700
++++ gcc-4.3.2/Makefile.in	2008-08-28 18:21:41.000000000 -0700
+@@ -272,6 +272,7 @@
+ AS_FOR_BUILD = @AS_FOR_BUILD@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
++CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+ CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
+ CXX_FOR_BUILD = @CXX_FOR_BUILD@
+ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
+@@ -502,6 +503,7 @@
+ 	"BISON=$(BISON)" \
+ 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+ 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
++	"CPPFLAGS_FOR_BUILD=$(CPPFLAGS_FOR_BUILD)" \
+ 	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
+ 	"EXPECT=$(EXPECT)" \
+ 	"FLEX=$(FLEX)" \
+--- /tmp/configure.ac	2008-11-18 09:29:01.000000000 +0100
++++ gcc-4.3/gcc/configure.ac	2008-11-18 09:31:21.000000000 +0100
+@@ -1784,6 +1784,7 @@
+ # These are the normal (build=host) settings:
+ CC_FOR_BUILD='$(CC)'		AC_SUBST(CC_FOR_BUILD)
+ BUILD_CFLAGS='$(ALL_CFLAGS)'	AC_SUBST(BUILD_CFLAGS)
++BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'   AC_SUBST(BUILD_CPPFLAGS)
+ STMP_FIXINC=stmp-fixinc		AC_SUBST(STMP_FIXINC)
+ 
+ # Possibly disable fixproto, on a per-target basis.
+@@ -1801,6 +1802,7 @@
+ if test x$build != x$host || test "x$coverage_flags" != x
+ then
+     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
++    BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
+ 
+     if test "x$TARGET_SYSTEM_ROOT" = x; then
+ 	if test "x$STMP_FIXPROTO" != x; then
+Index: gcc-4.3.2/Makefile.tpl
+===================================================================
+--- gcc-4.3.2.orig/Makefile.tpl	2008-08-28 18:21:20.000000000 -0700
++++ gcc-4.3.2/Makefile.tpl	2008-08-28 18:21:41.000000000 -0700
+@@ -275,6 +275,7 @@
+ AS_FOR_BUILD = @AS_FOR_BUILD@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
++CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+ CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
+ CXX_FOR_BUILD = @CXX_FOR_BUILD@
+ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
+--- /tmp/configure	2008-11-18 09:36:50.000000000 +0100
++++ gcc-4.3/configure	2008-11-18 09:39:09.000000000 +0100
+@@ -272,7 +272,7 @@
+ PACKAGE_BUGREPORT=
+ 
+ ac_unique_file="move-if-change"
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CPPFLAGS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
+ ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
+ 
+ # Initialize some variables set by options.
+@@ -5882,6 +5882,7 @@
+ # our build compiler if desired.
+ if test x"${build}" = x"${host}" ; then
+   CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
++  CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
+   CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
+   LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
+ fi
+@@ -5959,6 +5960,7 @@
+ 
+ 
+ 
++
+ # Generate default definitions for YACC, M4, LEX and other programs that run
+ # on the build machine.  These are used if the Makefile can't locate these
+ # programs in objdir.
+@@ -12840,6 +12842,7 @@
+ s,@AS_FOR_BUILD@,$AS_FOR_BUILD,;t t
+ s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
+ s,@CFLAGS_FOR_BUILD@,$CFLAGS_FOR_BUILD,;t t
++s,@CPPFLAGS_FOR_BUILD@,$CPPFLAGS_FOR_BUILD,;t t
+ s,@CXXFLAGS_FOR_BUILD@,$CXXFLAGS_FOR_BUILD,;t t
+ s,@CXX_FOR_BUILD@,$CXX_FOR_BUILD,;t t
+ s,@DLLTOOL_FOR_BUILD@,$DLLTOOL_FOR_BUILD,;t t
+--- /tmp/configure	2008-11-18 09:41:13.000000000 +0100
++++ gcc-4.3/gcc/configure	2008-11-18 09:43:27.000000000 +0100
+@@ -458,7 +458,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical licensedir build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical licensedir build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_CPPFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
+ ac_subst_files='language_hooks'
+ 
+ # Initialize some variables set by options.
+@@ -13550,6 +13550,7 @@
+ # These are the normal (build=host) settings:
+ CC_FOR_BUILD='$(CC)'
+ BUILD_CFLAGS='$(ALL_CFLAGS)'
++BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'
+ STMP_FIXINC=stmp-fixinc
+ 
+ # Possibly disable fixproto, on a per-target basis.
+@@ -13567,6 +13568,7 @@
+ if test x$build != x$host || test "x$coverage_flags" != x
+ then
+     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
++    BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
+ 
+     if test "x$TARGET_SYSTEM_ROOT" = x; then
+ 	if test "x$STMP_FIXPROTO" != x; then
+@@ -24032,6 +24034,7 @@
+ s,@inhibit_libc@,$inhibit_libc,;t t
+ s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
+ s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
++s,@BUILD_CPPFLAGS@,$BUILD_CPPFLAGS,;t t
+ s,@STMP_FIXINC@,$STMP_FIXINC,;t t
+ s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t
+ s,@collect2@,$collect2,;t t
diff --git a/recipes/gcc/gcc-csl-arm-2008q3/gcc41-configure.in.patch b/recipes/gcc/gcc-csl-arm-2008q3/gcc41-configure.in.patch
new file mode 100644
index 0000000000..3d33bcb978
--- /dev/null
+++ b/recipes/gcc/gcc-csl-arm-2008q3/gcc41-configure.in.patch
@@ -0,0 +1,22 @@
+--- gcc-3.4.4/configure.in.orig	2005-08-09 19:57:51.504323183 -0700
++++ gcc-3.4.4/configure.in	2005-08-09 20:00:12.073168623 -0700
+@@ -1907,7 +1907,7 @@
+   *) gxx_include_dir=${with_gxx_include_dir} ;;
+ esac
+ 
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+  *" newlib "*)
+   case " $target_configargs " in
+--- gcc-3.4.4/configure.orig	2005-08-09 21:02:29.668360660 -0700
++++ gcc-3.4.4/configure	2005-08-09 21:02:50.157649970 -0700
+@@ -2669,7 +2669,7 @@
+   *) gxx_include_dir=${with_gxx_include_dir} ;;
+ esac
+ 
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+  *" newlib "*)
+   case " $target_configargs " in
diff --git a/recipes/gcc/gcc-csl-arm-2008q3/gfortran-csl.patch b/recipes/gcc/gcc-csl-arm-2008q3/gfortran-csl.patch
new file mode 100644
index 0000000000..0c42851ce1
--- /dev/null
+++ b/recipes/gcc/gcc-csl-arm-2008q3/gfortran-csl.patch
@@ -0,0 +1,40 @@
+The patch below fixes a crash building libgfortran on arm-linux-gnueabi.
+
+This target doesn't really have a 128-bit integer type, however it does use 
+TImode to represent the return value of certain special ABI defined library 
+functions. This results in type_for_size(TImode) being called.
+
+Because TImode deosn't correspond to any gfortran integer kind 
+gfc_type_for_size returns NULL and we segfault shortly after.
+
+The patch below fixes this by making gfc_type_for_size handle TImode in the 
+same way as the C frontend.
+
+Tested on x86_64-linux and arm-linux-gnueabi.
+Applied to trunk.
+
+Paul
+
+2007-05-15  Paul Brook  <paul@codesourcery.com>
+
+	gcc/fortran/
+	* trans-types.c (gfc_type_for_size): Handle signed TImode.
+
+Index: gcc-4.2.1/gcc/fortran/trans-types.c
+===================================================================
+--- gcc-4.2.1/gcc/fortran/trans-types.c	(revision 170435)
++++ gcc-4.2.1/gcc/fortran/trans-types.c	(working copy)
+@@ -1800,6 +1800,13 @@ gfc_type_for_size (unsigned bits, int un
+ 	  if (type && bits == TYPE_PRECISION (type))
+ 	    return type;
+ 	}
++
++      /* Handle TImode as a special case because it is used by some backends
++         (eg. ARM) even though it is not available for normal use.  */
++#if HOST_BITS_PER_WIDE_INT >= 65
++      if (bits == TYPE_PRECISION (intTI_type_node))
++	return intTI_type_node;
++#endif
+     }
+   else
+     {
diff --git a/recipes/gcc/gcc-csl-arm-2008q3/zecke-no-host-includes.patch b/recipes/gcc/gcc-csl-arm-2008q3/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..6afb10d6ef
--- /dev/null
+++ b/recipes/gcc/gcc-csl-arm-2008q3/zecke-no-host-includes.patch
@@ -0,0 +1,31 @@
+Index: gcc-4.0.2/gcc/c-incpath.c
+===================================================================
+--- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
++++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
+@@ -350,6 +350,26 @@
+   p->construct = 0;
+   p->user_supplied_p = user_supplied_p;
+ 
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		 }
++	}
++#endif
++
+   add_cpp_dir_path (p, chain);
+ }
+
author	Denys Dmytriyenko <denis@denix.org>	2009-03-17 14:32:59 -0400
committer	Denys Dmytriyenko <denis@denix.org>	2009-03-17 14:32:59 -0400
commit	709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree	37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/gcc/gcc-csl-arm-2008q3
parent	fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)