Fix ARCH_FLAGS_FOR_TARGET and --with-build-sysroot on gcc 4.3.1.

We use ARCH_FLAGS_FOR_TARGET to overcome a bug in --with-build-sysroot implementation where it does not pass LDFLAGS_FOR_TARGET and CPPFLAGS_FOR_TARGET to libstdc++ during build.

4 files changed, 5500 insertions, 1 deletions

diff --git a/packages/gcc/gcc-4.3.1.inc b/packages/gcc/gcc-4.3.1.inc
index 3784727d9b..b14dd4acf5 100644
--- a/packages/gcc/gcc-4.3.1.inc
+++ b/packages/gcc/gcc-4.3.1.inc
@@ -45,7 +45,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://904-flatten-switch-stmt-00.patch;patch=1 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
-#	file://gcc41-configure.in.patch;patch=1 \
 #	file://arm-thumb.patch;patch=1 \
 #	file://arm-thumb-cache.patch;patch=1 \
 	file://ldflags.patch;patch=1 \
@@ -59,6 +58,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 #	file://intermask-bigendian.patch;patch=1 \
 	file://gcc-arm-frename-registers.patch;patch=1 \
 	file://gcc-release-branch/PR-36500-fix-neon.patch;patch=1 \
+	file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
+	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
 "
 
 SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
diff --git a/packages/gcc/gcc-4.3.1/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/packages/gcc/gcc-4.3.1/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
new file mode 100644
index 0000000000..f33e6c1ea6
--- /dev/null
+++ b/packages/gcc/gcc-4.3.1/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
@@ -0,0 +1,31 @@
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: gcc-4.3.1/configure.ac
+===================================================================
+--- gcc-4.3.1.orig/configure.ac	2008-07-21 12:29:18.000000000 -0700
++++ gcc-4.3.1/configure.ac	2008-07-21 12:29:35.000000000 -0700
+@@ -2352,7 +2352,7 @@ fi
+ # for target_alias and gcc doesn't manage it consistently.
+ target_configargs="--cache-file=./config.cache ${target_configargs}"
+ 
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+  *" newlib "*)
+   case " $target_configargs " in
+Index: gcc-4.3.1/configure
+===================================================================
+--- gcc-4.3.1.orig/configure	2008-07-21 12:29:48.000000000 -0700
++++ gcc-4.3.1/configure	2008-07-21 12:29:59.000000000 -0700
+@@ -5841,7 +5841,7 @@ fi
+ # for target_alias and gcc doesn't manage it consistently.
+ target_configargs="--cache-file=./config.cache ${target_configargs}"
+ 
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+  *" newlib "*)
+   case " $target_configargs " in
diff --git a/packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch b/packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch
new file mode 100644
index 0000000000..2a9605c3d6
--- /dev/null
+++ b/packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch
@@ -0,0 +1,5466 @@
+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         |   24 
+ Makefile.in          | 1802 +++++++++++++++++++++++++++++++--------------------
+ Makefile.tpl         |   57 -
+ config/mh-ppc-darwin |    3 
+ configure            |   36 -
+ configure.ac         |   32 
+ gcc/doc/install.texi |   56 -
+ 7 files changed, 1261 insertions(+), 749 deletions(-)
+
+Index: gcc-4.3.1/configure.ac
+===================================================================
+--- gcc-4.3.1.orig/configure.ac	2008-02-01 19:29:30.000000000 -0800
++++ gcc-4.3.1/configure.ac	2008-07-21 10:56:15.000000000 -0700
+@@ -1667,6 +1667,38 @@ AC_ARG_WITH([debug-prefix-map],
+   [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.1/Makefile.def
+===================================================================
+--- gcc-4.3.1.orig/Makefile.def	2007-10-23 08:53:18.000000000 -0700
++++ gcc-4.3.1/Makefile.def	2008-07-21 10:56:15.000000000 -0700
+@@ -511,43 +511,51 @@ bootstrap_stage = {
+ 	//   compiler probably has never heard of them.
+ 	stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \
+ 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
+-	stage_cflags='$(STAGE1_CFLAGS)' ; };
++	stage_cflags='$(STAGE1_CFLAGS)' ;
++	stage_libcflags='$(STAGE1_LIBCFLAGS)' ; };
+ bootstrap_stage = {
+ 	id=2 ; prev=1 ;
+ 	bootstrap_target=bootstrap2 ;
+ 	stage_configure_flags="@stage2_werror_flag@" ;
+-	stage_cflags="$(STAGE2_CFLAGS)" ; };
++	stage_cflags="$(STAGE2_CFLAGS)" ;
++	stage_libcflags="$(STAGE2_LIBCFLAGS)" ; };
+ bootstrap_stage = {
+ 	id=b2g0 ; prev=1 ;
+ 	bootstrap_target=bootstrap2-debug ;
+ 	stage_configure_flags="@stage2_werror_flag@" ;
+-	stage_cflags="$(STAGE2_CFLAGS) -g0" ; };
++	stage_cflags="$(STAGE2_CFLAGS) -g0" ;
++	stage_libcflags="$(STAGE2_LIBCFLAGS) -g0" ; };
+ bootstrap_stage = {
+ 	id=3 ; prev=2 ; lean=1 ;
+ 	compare_target=compare ;
+ 	bootstrap_target=bootstrap ;
+ 	cleanstrap_target=cleanstrap ;
+ 	stage_configure_flags="@stage2_werror_flag@" ;
+-	stage_cflags="$(STAGE3_CFLAGS)" ; };
++	stage_cflags="$(STAGE3_CFLAGS)" ;
++	stage_libcflags="$(STAGE3_LIBCFLAGS)" ; };
+ bootstrap_stage = {
+ 	id=b3g2 ; prev=b2g0 ; lean=1 ;
+ 	compare_target=compare-debug ;
+ 	bootstrap_target=bootstrap-debug ;
+ 	cleanstrap_target=cleanstrap-debug ;
+ 	stage_configure_flags="@stage2_werror_flag@" ;
+-	stage_cflags="$(STAGE3_CFLAGS) -g2" ; };
++	stage_cflags="$(STAGE3_CFLAGS) -g2" ;
++	stage_libcflags="$(STAGE3_LIBCFLAGS) -g2" ; };
+ bootstrap_stage = {
+ 	id=4 ; prev=3 ; lean=2 ;
+ 	compare_target=compare3 ;
+ 	bootstrap_target=bootstrap4 ;
+ 	stage_configure_flags="@stage2_werror_flag@" ;
+-	stage_cflags="$(STAGE4_CFLAGS)" ; };
++	stage_cflags="$(STAGE4_CFLAGS)" ;
++	stage_libcflags="$(STAGE4_CFLAGS)" ; };
+ bootstrap_stage = {
+ 	id=profile ; prev=1 ;
+ 	stage_configure_flags="@stage2_werror_flag@" ;
+-	stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; };
++	stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ;
++	stage_libcflags='$(STAGE2_LIBCFLAGS) -fprofile-generate' ; };
+ bootstrap_stage = {
+ 	id=feedback ; prev=profile ;
+ 	bootstrap_target=profiledbootstrap ;
+ 	stage_configure_flags="@stage2_werror_flag@" ;
+-	stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; };
++	stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ;
++	stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; };
+Index: gcc-4.3.1/Makefile.tpl
+===================================================================
+--- gcc-4.3.1.orig/Makefile.tpl	2008-07-21 10:56:14.000000000 -0700
++++ gcc-4.3.1/Makefile.tpl	2008-07-21 10:56:15.000000000 -0700
+@@ -207,10 +207,10 @@ BASE_TARGET_EXPORTS = \
+ 	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; \
+@@ -330,14 +330,19 @@ PICFLAG = 
+ # 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
+@@ -376,18 +381,11 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_
+ 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 = @LDFLAGS@ 
+@@ -491,19 +489,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \
+ # 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)' \
+@@ -851,9 +850,11 @@ configure-stage[+id+]-[+prefix+][+module
+ 	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; \
+@@ -890,7 +891,8 @@ all-[+prefix+][+module+]: configure-[+pr
+ 	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 +]
+@@ -910,8 +912,11 @@ all-stage[+id+]-[+prefix+][+module+]: co
+ 	[+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+])
+@@ -961,7 +966,7 @@ clean-stage[+id+]-[+prefix+][+module+]:
+ [+ 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+]
+@@ -1059,7 +1064,7 @@ maybe-[+make_target+]-[+module+]: [+make
+ 
+ [+ 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
+@@ -1070,7 +1075,7 @@ maybe-[+make_target+]-[+module+]: [+make
+ 
+ [+ 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+]
+Index: gcc-4.3.1/config/mh-ppc-darwin
+===================================================================
+--- gcc-4.3.1.orig/config/mh-ppc-darwin	2007-05-23 07:26:31.000000000 -0700
++++ gcc-4.3.1/config/mh-ppc-darwin	2008-07-21 10:56:15.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.1/gcc/doc/install.texi
+===================================================================
+--- gcc-4.3.1.orig/gcc/doc/install.texi	2008-05-22 23:58:10.000000000 -0700
++++ gcc-4.3.1/gcc/doc/install.texi	2008-07-21 10:56:15.000000000 -0700
+@@ -1772,33 +1772,35 @@ same described above, but object files f
+ 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
+@@ -2689,8 +2691,8 @@ cross-compilers on the Alpha for 32-bit 
+ 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
+Index: gcc-4.3.1/Makefile.in
+===================================================================
+--- gcc-4.3.1.orig/Makefile.in	2008-07-21 10:56:14.000000000 -0700
++++ gcc-4.3.1/Makefile.in	2008-07-21 10:56:15.000000000 -0700
+@@ -204,11 +204,10 @@ BASE_TARGET_EXPORTS = \
+ 	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; \
+-	CPP="$(CC_FOR_TARGET) -E"; export CPP; \
++	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; \
+@@ -328,14 +327,19 @@ PICFLAG = 
+ # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
+ # overrideable (for a bootstrap build stage1 also builds gcc.info).
+ 
+-STAGE1_CFLAGS=@stage1_cflags@
+ STAGE1_CHECKING=@stage1_checking@
+ STAGE1_LANGUAGES=@stage1_languages@
+ 
++STAGE1_CFLAGS=@stage1_cflags@
+ STAGE2_CFLAGS=$(BOOT_CFLAGS)
+ STAGE3_CFLAGS=$(BOOT_CFLAGS)
+ STAGE4_CFLAGS=$(BOOT_CFLAGS)
+ 
++STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
++STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
++STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
++STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
++
+ do-compare = @do_compare@
+ do-compare3 = $(do-compare)
+ do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
+@@ -374,18 +378,11 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_
+ 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 = @LDFLAGS@ 
+@@ -592,19 +589,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \
+ # Flags to pass down to makes which are built with the target environment.
+ # The double $ decreases the length of the command line; those variables
+ # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
+-# COMPILER_ prefixed variables are not passed down so we expand them here.
++# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty,
++# so we expand them here.
+ EXTRA_TARGET_FLAGS = \
+ 	'AR=$$(AR_FOR_TARGET)' \
+ 	'AS=$(COMPILER_AS_FOR_TARGET)' \
+ 	'CC=$$(CC_FOR_TARGET)' \
+-	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
++	'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
+ 	'CXX=$$(CXX_FOR_TARGET)' \
+-	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
++	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
+ 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+ 	'LD=$(COMPILER_LD_FOR_TARGET)' \
+ 	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
+-	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
+-	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
++	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
++	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
+ 	'NM=$(COMPILER_NM_FOR_TARGET)' \
+ 	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
+ 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
+@@ -2738,7 +2736,8 @@ all-build-libiberty: configure-build-lib
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/libiberty && \
+-	  $(MAKE)   $(TARGET-build-libiberty))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
++		$(TARGET-build-libiberty))
+ @endif build-libiberty
+ 
+ 
+@@ -2793,7 +2792,8 @@ all-build-bison: configure-build-bison
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/bison && \
+-	  $(MAKE)   $(TARGET-build-bison))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
++		$(TARGET-build-bison))
+ @endif build-bison
+ 
+ 
+@@ -2848,7 +2848,8 @@ all-build-byacc: configure-build-byacc
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/byacc && \
+-	  $(MAKE)   $(TARGET-build-byacc))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
++		$(TARGET-build-byacc))
+ @endif build-byacc
+ 
+ 
+@@ -2903,7 +2904,8 @@ all-build-flex: configure-build-flex
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/flex && \
+-	  $(MAKE)   $(TARGET-build-flex))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
++		$(TARGET-build-flex))
+ @endif build-flex
+ 
+ 
+@@ -2958,7 +2960,8 @@ all-build-m4: configure-build-m4
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/m4 && \
+-	  $(MAKE)   $(TARGET-build-m4))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
++		$(TARGET-build-m4))
+ @endif build-m4
+ 
+ 
+@@ -3013,7 +3016,8 @@ all-build-texinfo: configure-build-texin
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/texinfo && \
+-	  $(MAKE)   $(TARGET-build-texinfo))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
++		$(TARGET-build-texinfo))
+ @endif build-texinfo
+ 
+ 
+@@ -3068,7 +3072,8 @@ all-build-fixincludes: configure-build-f
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/fixincludes && \
+-	  $(MAKE)   $(TARGET-build-fixincludes))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
++		$(TARGET-build-fixincludes))
+ @endif build-fixincludes
+ 
+ 
+@@ -3127,7 +3132,8 @@ all-ash: configure-ash
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+ 	(cd $(HOST_SUBDIR)/ash && \
+-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ash))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
++		$(TARGET-ash))
+ @endif ash
+ 
+ 
+@@ -3551,7 +3557,8 @@ all-autoconf: configure-autoconf
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+ 	(cd $(HOST_SUBDIR)/autoconf && \
+-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-autoconf))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
++		$(TARGET-autoconf))
+ @endif autoconf
+ 
+ 
+@@ -3975,7 +3982,8 @@ all-automake: configure-automake
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+ 	(cd $(HOST_SUBDIR)/automake && \
+-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-automake))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
++		$(TARGET-automake))
+ @endif automake
+ 
+ 
+@@ -4399,7 +4407,8 @@ all-bash: configure-bash
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+ 	(cd $(HOST_SUBDIR)/bash && \
+-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bash))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
++		$(TARGET-bash))
+ @endif bash
+ 
+ 
+@@ -4816,9 +4825,9 @@ configure-stage1-bfd:
+ 	@r=`${PWD_COMMAND}`; export r; \
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+-	$(HOST_EXPORTS) \
++	$(HOST_EXPORTS)  \
+ 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+-	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
++	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+ 	echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
+ 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+ 	cd $(HOST_SUBDIR)/bfd || exit 1; \
+@@ -4847,9 +4856,9 @@ configure-stage2-bfd:
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+ 	$(HOST_EXPORTS) \
+-	$(POSTSTAGE1_HOST_EXPORTS) \
++	$(POSTSTAGE1_HOST_EXPORTS)  \
+ 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+-	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
++	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+ 	echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
+ 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+ 	cd $(HOST_SUBDIR)/bfd || exit 1; \
+@@ -4878,9 +4887,9 @@ configure-stageb2g0-bfd:
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+ 	$(HOST_EXPORTS) \
+-	$(POSTSTAGE1_HOST_EXPORTS) \
++	$(POSTSTAGE1_HOST_EXPORTS)  \
+ 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
+-	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
++	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
+ 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/bfd ; \
+ 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+ 	cd $(HOST_SUBDIR)/bfd || exit 1; \
+@@ -4909,9 +4918,9 @@ configure-stage3-bfd:
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+ 	$(HOST_EXPORTS) \
+-	$(POSTSTAGE1_HOST_EXPORTS) \
++	$(POSTSTAGE1_HOST_EXPORTS)  \
+ 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+-	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
++	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+ 	echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
+ 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+ 	cd $(HOST_SUBDIR)/bfd || exit 1; \
+@@ -4940,9 +4949,9 @@ configure-stageb3g2-bfd:
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+ 	$(HOST_EXPORTS) \
+-	$(POSTSTAGE1_HOST_EXPORTS) \
++	$(POSTSTAGE1_HOST_EXPORTS)  \
+ 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
+-	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
++	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
+ 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/bfd ; \
+ 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+ 	cd $(HOST_SUBDIR)/bfd || exit 1; \
+@@ -4971,9 +4980,9 @@ configure-stage4-bfd:
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+ 	$(HOST_EXPORTS) \
+-	$(POSTSTAGE1_HOST_EXPORTS) \
++	$(POSTSTAGE1_HOST_EXPORTS)  \
+ 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+-	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
++	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+ 	echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
+ 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+ 	cd $(HOST_SUBDIR)/bfd || exit 1; \
+@@ -5002,9 +5011,9 @@ configure-stageprofile-bfd:
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+ 	$(HOST_EXPORTS) \
+-	$(POSTSTAGE1_HOST_EXPORTS) \
++	$(POSTSTAGE1_HOST_EXPORTS)  \
+ 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
+-	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
++	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+ 	echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
+ 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+ 	cd $(HOST_SUBDIR)/bfd || exit 1; \
+@@ -5033,9 +5042,9 @@ configure-stagefeedback-bfd:
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+ 	$(HOST_EXPORTS) \
+-	$(POSTSTAGE1_HOST_EXPORTS) \
++	$(POSTSTAGE1_HOST_EXPORTS)  \
+ 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
+-	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
++	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+ 	echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
+ 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+ 	cd $(HOST_SUBDIR)/bfd || exit 1; \
+@@ -5070,7 +5079,8 @@ all-bfd: configure-bfd
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+ 	(cd $(HOST_SUBDIR)/bfd && \
+-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bfd))
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
++		$(TARGET-bfd))
+ @endif bfd
+ 
+ 
+@@ -5089,8 +5099,11 @@ all-stage1-bfd: configure-stage1-bfd
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+ 	cd $(HOST_SUBDIR)/bfd && \
+-	$(MAKE) $(FLAGS_TO_PASS) \
+-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
++	$(MAKE) $(BASE_FLAGS_TO_PASS) \
++		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
++		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
++		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
++		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
+ 		$(TARGET-stage1-bfd)
+ 
+ maybe-clean-stage1-bfd: clean-stage1-bfd
+@@ -5103,7 +5116,7 @@ clean-stage1-bfd:
+ 	  $(MAKE) stage1-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/bfd && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		 clean
+ @endif bfd-bootstrap
+ 
+@@ -5123,8 +5136,11 @@ all-stage2-bfd: configure-stage2-bfd
+ 	$(HOST_EXPORTS) \
+ 	$(POSTSTAGE1_HOST_EXPORTS) \
+ 	cd $(HOST_SUBDIR)/bfd && \
+-	$(MAKE) $(FLAGS_TO_PASS) \
+-		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
++	$(MAKE) $(BASE_FLAGS_TO_PASS) \
++		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
++		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
++		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
++		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+ 		$(TARGET-stage2-bfd)
+ 
+ maybe-clean-stage2-bfd: clean-stage2-bfd
+@@ -5137,7 +5153,7 @@ clean-stage2-bfd:
+ 	  $(MAKE) stage2-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/bfd && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+ 		 clean
+ @endif bfd-bootstrap
+@@ -5158,8 +5174,11 @@ all-stageb2g0-bfd: configure-stageb2g0-b
+ 	$(HOST_EXPORTS) \
+ 	$(POSTSTAGE1_HOST_EXPORTS) \
+ 	cd $(HOST_SUBDIR)/bfd && \
+-	$(MAKE) $(FLAGS_TO_PASS) \
+-		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
++	$(MAKE) $(BASE_FLAGS_TO_PASS) \
++		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
++		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
++		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
++		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+ 		$(TARGET-stageb2g0-bfd)
+ 
+ maybe-clean-stageb2g0-bfd: clean-stageb2g0-bfd
+@@ -5172,7 +5191,7 @@ clean-stageb2g0-bfd:
+ 	  $(MAKE) stageb2g0-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/bfd && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+ 		 clean
+ @endif bfd-bootstrap
+@@ -5193,8 +5212,11 @@ all-stage3-bfd: configure-stage3-bfd
+ 	$(HOST_EXPORTS) \
+ 	$(POSTSTAGE1_HOST_EXPORTS) \
+ 	cd $(HOST_SUBDIR)/bfd && \
+-	$(MAKE) $(FLAGS_TO_PASS) \
+-		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
++	$(MAKE) $(BASE_FLAGS_TO_PASS) \
++		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
++		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
++		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
++		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+ 		$(TARGET-stage3-bfd)
+ 
+ maybe-clean-stage3-bfd: clean-stage3-bfd
+@@ -5207,7 +5229,7 @@ clean-stage3-bfd:
+ 	  $(MAKE) stage3-start; \
+ 	fi; \
+ 	cd $(HOST_SUBDIR)/bfd && \
+-	$(MAKE) $(FLAGS_TO_PASS)  \
++	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+ 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+ 		 clean
+ @endif bfd-bootstrap
+@@ -5228,8 +5250,11 @@ all-stageb3g2-bfd: configure-stageb3g2-b
+ 	$(HOST_EXPORTS) \
+ 	$(POSTSTAGE1_HOST_EXPORTS) \
+ 	cd $(HOST_SUBDIR)/bfd && \
+-	$(MAKE) $(FLAGS_TO_PASS) \