final merge from trunk

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/cond-optab@147419 138bc75d-0d04-0410-961f-82ee72b054a4

62 files changed, 2497 insertions, 4211 deletions

diff --git a/ChangeLog b/ChangeLog
index 39ad00f9602..9a4630eed79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2009-05-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR target/37137
+	* Makefile.def (flags_to_pass): Remove redundant and incomplete
+	STAGE1_CFLAGS, STAGE2_CFLAGS, STAGE3_CFLAGS, and STAGE4_CFLAGS.
+	Add FLAGS_FOR_TARGET and BUILD_CONFIG.
+	(bootstrap_stage): Remove bootstrap-debug custom stages.  Turn
+	stage_configureflags, stage_cflags and stage_libcflags into
+	explicit Makefile macros.
+	* Makefile.tpl (HOST_EXPORTS, EXTRA_HOST_FLAGS): Pass GCJ and
+	GFORTRAN.
+	(POSTSTAGE1_HOST_EXPORTS): Add XGCC_FLAGS_FOR_TARGET and TFLAGS to
+	CC.  Set CC_FOR_BUILD from CC.
+	(BASE_TARGET_EXPORTS, RAW_CXX_TARGET_EXPORTS,
+	NORMAL_TARGET_EXPORTS): Move SYSROOT_CFLAGS_FOR_TARGET and
+	DEBUG_PREFIX_CFLAGS_FOR_TARGET from CFLAGS and CXXFLAGS to
+	XGCC_FLAGS_FOR_TARGET.  Add it along with TFLAGS to CC, CXX, GCJ,
+	and GFORTRAN.
+	(TFLAGS, STAGE_CFLAGS, STAGE_TFLAGS, STAGE_CONFIGURE_FLAGS): New.
+	(_LIBCFLAGS): Renamed to _TFLAGS.
+	(do-compare-debug, do-compare3-debug): Drop.
+	(CC, GCC_FOR_TARGET, CXX_FOR_TARGET, RAW_CXX_FOR_TARGET,
+	GCJ_FOR_TARGET, GFORTRAN_FOR_TARGET): Remove FLAGS_FOR_TARGET.
+	(FLAGS_FOR_TARGET, SYSROOT_CFLAGS_FOR_TARGET,
+	DEBUG_PREFIX_CFLAGS_FOR_TARGET): Move down.
+	(XGCC_FLAGS_FOR_TARGET): New.
+	(BASE_FLAGS_TO_PASS): Pass STAGEid_CFLAGS, STAGEid_TFLAGS and TFLAGS.
+	(EXTRA_HOST_FLAGS): Pass GCJ and GFORTRAN.
+	(POSTSTAGE1_FLAGS_TO_PASS): Move SYSROOT_CFLAGS_FOR_TARGET and
+	DEBUG_PREFIX_CFLAGS_FOR_TARGET from CFLAGS, CXXFLAGS, LIBCFLAGS,
+	LIBCXXFLAGS to XGCC_FLAGS_FOR_TARGET.    Add it along with TFLAGS
+	to CC, CXX, GCJ, and GFORTRAN.  Pass XGCC_FLAGS_FOR_TARGET and
+	TFLAGS.
+	(BUILD_CONFIG): Include if requested.
+	(all): Set TFLAGS on bootstrap.
+	(configure-stageid-prefixmodule): Pass TFLAGS, adjust FLAGS.
+	(all-stageid-prefixmodule): Likewise.
+	(do-clean, distclean-stageid): Set TFLAGS.
+	(restrap): Fix whitespace.
+	* Makefile.in: Rebuilt.
+
 2009-05-07  Paolo Bonzini  <bonzini@gnu.org>
 
 	* config.guess: Sync with src.
diff --git a/Makefile.def b/Makefile.def
index ceee5558d09..86cf7588da5 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -255,12 +255,8 @@ flags_to_pass = { flag= CXXFLAGS ; };
 flags_to_pass = { flag= LDFLAGS ; };
 flags_to_pass = { flag= LIBCFLAGS ; };
 flags_to_pass = { flag= LIBCXXFLAGS ; };
-flags_to_pass = { flag= STAGE1_CFLAGS ; };
 flags_to_pass = { flag= STAGE1_CHECKING ; };
 flags_to_pass = { flag= STAGE1_LANGUAGES ; };
-flags_to_pass = { flag= STAGE2_CFLAGS ; };
-flags_to_pass = { flag= STAGE3_CFLAGS ; };
-flags_to_pass = { flag= STAGE4_CFLAGS ; };
 flags_to_pass = { flag= GNATBIND ; };
 flags_to_pass = { flag= GNATMAKE ; };
 
@@ -273,6 +269,7 @@ flags_to_pass = { flag= CPPFLAGS_FOR_TARGET ; };
 flags_to_pass = { flag= CXX_FOR_TARGET ; };
 flags_to_pass = { flag= CXXFLAGS_FOR_TARGET ; };
 flags_to_pass = { flag= DLLTOOL_FOR_TARGET ; };
+flags_to_pass = { flag= FLAGS_FOR_TARGET ; };
 flags_to_pass = { flag= GCJ_FOR_TARGET ; };
 flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; };
 flags_to_pass = { flag= LD_FOR_TARGET ; };
@@ -288,6 +285,7 @@ flags_to_pass = { flag= WINDRES_FOR_TARGET ; };
 flags_to_pass = { flag= WINDMC_FOR_TARGET ; };
 
 // Miscellaneous
+flags_to_pass = { flag= BUILD_CONFIG ; };
 flags_to_pass = { flag= LANGUAGES ; optional=true ; };
 flags_to_pass = { flag= LEAN ; };
 
@@ -555,62 +553,21 @@ languages = { language=objc;	gcc-check-target=check-objc;
 languages = { language=obj-c++;	gcc-check-target=check-obj-c++; };
 
 // Toplevel bootstrap
-bootstrap_stage = {
-	id=1 ;
-
-	// * We force-disable intermodule optimizations, even if
-	//   --enable-intermodule was passed, since the installed compiler
-	//   probably can't handle them.  Luckily, autoconf always respects
-	//   the last argument when conflicting --enable arguments are passed.
-	// * Likewise, we force-disable coverage flags, since the installed
-	//   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_libcflags='$(STAGE1_LIBCFLAGS)' ; };
+bootstrap_stage = { id=1 ; };
 bootstrap_stage = {
 	id=2 ; prev=1 ;
-	bootstrap_target=bootstrap2 ;
-	stage_configure_flags="@stage2_werror_flag@" ;
-	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_libcflags="$(STAGE2_LIBCFLAGS) -g0" ; };
+	bootstrap_target=bootstrap2 ; };
 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_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_libcflags="$(STAGE3_LIBCFLAGS) -g2" ; };
+	cleanstrap_target=cleanstrap ; };
 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_libcflags="$(STAGE4_CFLAGS)" ; };
+	bootstrap_target=bootstrap4 ; };
 bootstrap_stage = {
-	id=profile ; prev=1 ;
-	stage_configure_flags="@stage2_werror_flag@" ;
-	stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ;
-	stage_libcflags='$(STAGE2_LIBCFLAGS)' ; };
+	id=profile ; prev=1 ; };
 bootstrap_stage = {
 	id=feedback ; prev=profile ;
-	bootstrap_target=profiledbootstrap ;
-	stage_configure_flags="@stage2_werror_flag@" ;
-	stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ;
-	stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; };
+	bootstrap_target=profiledbootstrap ; };
diff --git a/Makefile.in b/Makefile.in
index 238ed68c4cd..d969c6d0529 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
+#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
@@ -175,6 +175,8 @@ HOST_EXPORTS = \
 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
 	CXX="$(CXX)"; export CXX; \
 	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
+	GCJ="$(GCJ)"; export GCJ; \
+	GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
 	AR="$(AR)"; export AR; \
 	AS="$(AS)"; export AS; \
 	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@@ -210,11 +212,9 @@ HOST_EXPORTS = \
 POSTSTAGE1_HOST_EXPORTS = \
 	$(HOST_EXPORTS) \
 	CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
-	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
-	CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \
-	  $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
-	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
-	  -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
+	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ \
+	  $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
+	CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \
 	GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND \
 	LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS;
 
@@ -229,13 +229,13 @@ BASE_TARGET_EXPORTS = \
 	$(BASE_EXPORTS) \
 	AR="$(AR_FOR_TARGET)"; export AR; \
 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
-	CC="$(CC_FOR_TARGET)"; export CC; \
-	CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
-	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; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \
+	GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
 	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
 	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
@@ -251,11 +251,11 @@ BASE_TARGET_EXPORTS = \
 RAW_CXX_TARGET_EXPORTS = \
 	$(BASE_TARGET_EXPORTS) \
 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
-	CXX="$(RAW_CXX_FOR_TARGET)"; export CXX;
+	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
 
 NORMAL_TARGET_EXPORTS = \
 	$(BASE_TARGET_EXPORTS) \
-	CXX="$(CXX_FOR_TARGET)"; export CXX;
+	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
 
 # Where to find GMP
 HOST_GMPLIBS = @gmplibs@
@@ -355,48 +355,90 @@ LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 
+TFLAGS =
+
+# Defaults for all stages; some are overridden below.
+
+STAGE_CFLAGS = $(BOOT_CFLAGS)
+STAGE_TFLAGS = $(TFLAGS)
+STAGE_CONFIGURE_FLAGS=@stage2_werror_flag@
+
+
+# Defaults for stage 1; some are overridden below.
+STAGE1_CFLAGS = $(STAGE_CFLAGS)
+STAGE1_TFLAGS = $(STAGE_TFLAGS)
+STAGE1_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+
+# Defaults for stage 2; some are overridden below.
+STAGE2_CFLAGS = $(STAGE_CFLAGS)
+STAGE2_TFLAGS = $(STAGE_TFLAGS)
+STAGE2_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+
+# Defaults for stage 3; some are overridden below.
+STAGE3_CFLAGS = $(STAGE_CFLAGS)
+STAGE3_TFLAGS = $(STAGE_TFLAGS)
+STAGE3_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+
+# Defaults for stage 4; some are overridden below.
+STAGE4_CFLAGS = $(STAGE_CFLAGS)
+STAGE4_TFLAGS = $(STAGE_TFLAGS)
+STAGE4_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+
+# Defaults for stage profile; some are overridden below.
+STAGEprofile_CFLAGS = $(STAGE_CFLAGS)
+STAGEprofile_TFLAGS = $(STAGE_TFLAGS)
+STAGEprofile_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+
+# Defaults for stage feedback; some are overridden below.
+STAGEfeedback_CFLAGS = $(STAGE_CFLAGS)
+STAGEfeedback_TFLAGS = $(STAGE_TFLAGS)
+STAGEfeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+
+
 # 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
 # only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS),
 # 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@
+# * We force-disable intermodule optimizations, even if
+#   --enable-intermodule was passed, since the installed compiler
+#   probably can't handle them.  Luckily, autoconf always respects
+#   the last argument when conflicting --enable arguments are passed.
+# * Likewise, we force-disable coverage flags, since the installed
+#   compiler probably has never heard of them.
+STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
+	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
 
-STAGE1_CFLAGS=@stage1_cflags@
-STAGE2_CFLAGS=$(BOOT_CFLAGS)
-STAGE3_CFLAGS=$(BOOT_CFLAGS)
-STAGE4_CFLAGS=$(BOOT_CFLAGS)
+STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
+STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
 
-STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
+STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use
+STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS)
 
 do-compare = @do_compare@
 do-compare3 = $(do-compare)
-do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
 
 # -----------------------------------------------
 # Programs producing files for the TARGET machine
 # -----------------------------------------------
 
-FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
-
 AR_FOR_TARGET=@AR_FOR_TARGET@
 AS_FOR_TARGET=@AS_FOR_TARGET@
-CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
+CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@
 
 # If GCC_FOR_TARGET is not overriden on the command line, then this
 # variable is passed down to the gcc Makefile, where it is used to
 # build libgcc2.a.  We define it here so that it can itself be
 # overridden on the command line.
-GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET)
+GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@
+CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@
+RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
+GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@
+GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
 DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
 LD_FOR_TARGET=@LD_FOR_TARGET@
 
@@ -414,13 +456,17 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_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@
 
 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 LDFLAGS_FOR_TARGET = 
 
+FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
+SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
+DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
+
+XGCC_FLAGS_FOR_TARGET = $(FLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
+
 # ------------------------------------
 # Miscellaneous targets and flag lists
 # ------------------------------------
@@ -555,12 +601,8 @@ BASE_FLAGS_TO_PASS = \
 	"LDFLAGS=$(LDFLAGS)" \
 	"LIBCFLAGS=$(LIBCFLAGS)" \
 	"LIBCXXFLAGS=$(LIBCXXFLAGS)" \
-	"STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \
 	"STAGE1_CHECKING=$(STAGE1_CHECKING)" \
 	"STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \
-	"STAGE2_CFLAGS=$(STAGE2_CFLAGS)" \
-	"STAGE3_CFLAGS=$(STAGE3_CFLAGS)" \
-	"STAGE4_CFLAGS=$(STAGE4_CFLAGS)" \
 	"GNATBIND=$(GNATBIND)" \
 	"GNATMAKE=$(GNATMAKE)" \
 	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
@@ -571,6 +613,7 @@ BASE_FLAGS_TO_PASS = \
 	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
 	"CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
 	"DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
+	"FLAGS_FOR_TARGET=$(FLAGS_FOR_TARGET)" \
 	"GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
 	"GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
 	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
@@ -584,8 +627,22 @@ BASE_FLAGS_TO_PASS = \
 	"STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \
 	"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
 	"WINDMC_FOR_TARGET=$(WINDMC_FOR_TARGET)" \
+	"BUILD_CONFIG=$(BUILD_CONFIG)" \
 	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"LEAN=$(LEAN)" \
+	"STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \
+	"STAGE1_TFLAGS=$(STAGE1_TFLAGS)" \
+	"STAGE2_CFLAGS=$(STAGE2_CFLAGS)" \
+	"STAGE2_TFLAGS=$(STAGE2_TFLAGS)" \
+	"STAGE3_CFLAGS=$(STAGE3_CFLAGS)" \
+	"STAGE3_TFLAGS=$(STAGE3_TFLAGS)" \
+	"STAGE4_CFLAGS=$(STAGE4_CFLAGS)" \
+	"STAGE4_TFLAGS=$(STAGE4_TFLAGS)" \
+	"STAGEprofile_CFLAGS=$(STAGEprofile_CFLAGS)" \
+	"STAGEprofile_TFLAGS=$(STAGEprofile_TFLAGS)" \
+	"STAGEfeedback_CFLAGS=$(STAGEfeedback_CFLAGS)" \
+	"STAGEfeedback_TFLAGS=$(STAGEfeedback_TFLAGS)" \
+	"TFLAGS=$(TFLAGS)" \
 	"CONFIG_SHELL=$(SHELL)" \
 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
 
@@ -600,6 +657,8 @@ EXTRA_HOST_FLAGS = \
 	'CC=$(CC)' \
 	'CXX=$(CXX)' \
 	'DLLTOOL=$(DLLTOOL)' \
+	'GCJ=$(GCJ)' \
+	'GFORTRAN=$(GFORTRAN)' \
 	'LD=$(LD)' \
 	'LIPO=$(LIPO)' \
 	'NM=$(NM)' \
@@ -638,20 +697,24 @@ POSTSTAGE1_FLAGS_TO_PASS = \
 EXTRA_TARGET_FLAGS = \
 	'AR=$$(AR_FOR_TARGET)' \
 	'AS=$(COMPILER_AS_FOR_TARGET)' \
-	'CC=$$(CC_FOR_TARGET)' \
-	'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
-	'CXX=$$(CXX_FOR_TARGET)' \
-	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
+	'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
+	'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+	'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
 	'LD=$(COMPILER_LD_FOR_TARGET)' \
 	'LDFLAGS=$$(LDFLAGS_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)' \
+	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
+	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
 	'NM=$(COMPILER_NM_FOR_TARGET)' \
 	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
 	'WINDRES=$$(WINDRES_FOR_TARGET)' \
-	'WINDMC=$$(WINDMC_FOR_TARGET)'
+	'WINDMC=$$(WINDMC_FOR_TARGET)' \
+	'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
+	"TFLAGS=$$TFLAGS"
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 
@@ -671,6 +734,13 @@ EXTRA_GCC_FLAGS = \
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
 
+@if gcc
+BUILD_CONFIG =
+ifneq ($(BUILD_CONFIG),)
+include $(foreach CONFIG, $(BUILD_CONFIG), $(srcdir)/config/$(CONFIG).mk)
+endif
+@endif gcc
+
 .PHONY: configure-host
 configure-host:  \
     maybe-configure-ash \
@@ -783,11 +853,17 @@ all:
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if [ -f stage_last ]; then \
+@if gcc-bootstrap
+	if [ -f stage_last ]; then : ; \
+	  TFLAGS="$(STAGE$(shell sed s,^stage,, stage_last)_TFLAGS)"; \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
 	else \
+@endif gcc-bootstrap
 	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
-	fi
+@if gcc-bootstrap
+	fi; \
+@endif gcc-bootstrap
+	:
 
 .PHONY: all-build
 
@@ -4946,10 +5022,12 @@ configure-stage1-bfd:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
 	cd $(HOST_SUBDIR)/bfd || exit 1; \
@@ -4963,8 +5041,7 @@ configure-stage1-bfd:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
 .PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
@@ -4976,11 +5053,13 @@ configure-stage2-bfd:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
 	cd $(HOST_SUBDIR)/bfd || exit 1; \
@@ -4995,38 +5074,7 @@ configure-stage2-bfd:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-.PHONY: configure-stageb2g0-bfd maybe-configure-stageb2g0-bfd
-maybe-configure-stageb2g0-bfd:
-@if bfd-bootstrap
-maybe-configure-stageb2g0-bfd: configure-stageb2g0-bfd
-configure-stageb2g0-bfd:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
 .PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
@@ -5038,11 +5086,13 @@ configure-stage3-bfd:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
 	cd $(HOST_SUBDIR)/bfd || exit 1; \
@@ -5057,38 +5107,7 @@ configure-stage3-bfd:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-.PHONY: configure-stageb3g2-bfd maybe-configure-stageb3g2-bfd
-maybe-configure-stageb3g2-bfd:
-@if bfd-bootstrap
-maybe-configure-stageb3g2-bfd: configure-stageb3g2-bfd
-configure-stageb3g2-bfd:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
 .PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
@@ -5100,11 +5119,13 @@ configure-stage4-bfd:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
 	cd $(HOST_SUBDIR)/bfd || exit 1; \
@@ -5119,7 +5140,7 @@ configure-stage4-bfd:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
 .PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
@@ -5131,11 +5152,13 @@ configure-stageprofile-bfd:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
 	cd $(HOST_SUBDIR)/bfd || exit 1; \
@@ -5150,7 +5173,7 @@ configure-stageprofile-bfd:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
 .PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
@@ -5162,11 +5185,13 @@ configure-stagefeedback-bfd:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
 	cd $(HOST_SUBDIR)/bfd || exit 1; \
@@ -5181,7 +5206,7 @@ configure-stagefeedback-bfd:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
 
@@ -5219,13 +5244,18 @@ all-stage1-bfd: configure-stage1-bfd
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-bfd)
 
 maybe-clean-stage1-bfd: clean-stage1-bfd
@@ -5255,14 +5285,19 @@ all-stage2-bfd: configure-stage2-bfd
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-bfd)
 
 maybe-clean-stage2-bfd: clean-stage2-bfd
@@ -5281,44 +5316,6 @@ clean-stage2-bfd:
 @endif bfd-bootstrap
 
 
-.PHONY: all-stageb2g0-bfd maybe-all-stageb2g0-bfd
-.PHONY: clean-stageb2g0-bfd maybe-clean-stageb2g0-bfd
-maybe-all-stageb2g0-bfd:
-maybe-clean-stageb2g0-bfd:
-@if bfd-bootstrap
-maybe-all-stageb2g0-bfd: all-stageb2g0-bfd
-all-stageb2g0: all-stageb2g0-bfd
-TARGET-stageb2g0-bfd = $(TARGET-bfd)
-all-stageb2g0-bfd: configure-stageb2g0-bfd
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-bfd
-clean-stageb2g0-bfd:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-bfd/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif bfd-bootstrap
-
-
 .PHONY: all-stage3-bfd maybe-all-stage3-bfd
 .PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
 maybe-all-stage3-bfd:
@@ -5331,14 +5328,19 @@ all-stage3-bfd: configure-stage3-bfd
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-bfd)
 
 maybe-clean-stage3-bfd: clean-stage3-bfd
@@ -5357,44 +5359,6 @@ clean-stage3-bfd:
 @endif bfd-bootstrap
 
 
-.PHONY: all-stageb3g2-bfd maybe-all-stageb3g2-bfd
-.PHONY: clean-stageb3g2-bfd maybe-clean-stageb3g2-bfd
-maybe-all-stageb3g2-bfd:
-maybe-clean-stageb3g2-bfd:
-@if bfd-bootstrap
-maybe-all-stageb3g2-bfd: all-stageb3g2-bfd
-all-stageb3g2: all-stageb3g2-bfd
-TARGET-stageb3g2-bfd = $(TARGET-bfd)
-all-stageb3g2-bfd: configure-stageb3g2-bfd
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-bfd
-clean-stageb3g2-bfd:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-bfd/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif bfd-bootstrap
-
-
 .PHONY: all-stage4-bfd maybe-all-stage4-bfd
 .PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
 maybe-all-stage4-bfd:
@@ -5407,14 +5371,19 @@ all-stage4-bfd: configure-stage4-bfd
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-bfd)
 
 maybe-clean-stage4-bfd: clean-stage4-bfd
@@ -5445,14 +5414,19 @@ all-stageprofile-bfd: configure-stageprofile-bfd
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-bfd)
 
 maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
@@ -5483,14 +5457,19 @@ all-stagefeedback-bfd: configure-stagefeedback-bfd
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-bfd)
 
 maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
@@ -5909,10 +5888,12 @@ configure-stage1-opcodes:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
@@ -5926,8 +5907,7 @@ configure-stage1-opcodes:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
 .PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
@@ -5939,11 +5919,13 @@ configure-stage2-opcodes:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
@@ -5958,38 +5940,7 @@ configure-stage2-opcodes:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
-.PHONY: configure-stageb2g0-opcodes maybe-configure-stageb2g0-opcodes
-maybe-configure-stageb2g0-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stageb2g0-opcodes: configure-stageb2g0-opcodes
-configure-stageb2g0-opcodes:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
 .PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
@@ -6001,11 +5952,13 @@ configure-stage3-opcodes:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
@@ -6020,38 +5973,7 @@ configure-stage3-opcodes:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
-.PHONY: configure-stageb3g2-opcodes maybe-configure-stageb3g2-opcodes
-maybe-configure-stageb3g2-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stageb3g2-opcodes: configure-stageb3g2-opcodes
-configure-stageb3g2-opcodes:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
 .PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
@@ -6063,11 +5985,13 @@ configure-stage4-opcodes:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
@@ -6082,7 +6006,7 @@ configure-stage4-opcodes:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
 .PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
@@ -6094,11 +6018,13 @@ configure-stageprofile-opcodes:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
@@ -6113,7 +6039,7 @@ configure-stageprofile-opcodes:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
 .PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
@@ -6125,11 +6051,13 @@ configure-stagefeedback-opcodes:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
@@ -6144,7 +6072,7 @@ configure-stagefeedback-opcodes:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
 
@@ -6182,13 +6110,18 @@ all-stage1-opcodes: configure-stage1-opcodes
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-opcodes)
 
 maybe-clean-stage1-opcodes: clean-stage1-opcodes
@@ -6218,14 +6151,19 @@ all-stage2-opcodes: configure-stage2-opcodes
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-opcodes)
 
 maybe-clean-stage2-opcodes: clean-stage2-opcodes
@@ -6244,44 +6182,6 @@ clean-stage2-opcodes:
 @endif opcodes-bootstrap
 
 
-.PHONY: all-stageb2g0-opcodes maybe-all-stageb2g0-opcodes
-.PHONY: clean-stageb2g0-opcodes maybe-clean-stageb2g0-opcodes
-maybe-all-stageb2g0-opcodes:
-maybe-clean-stageb2g0-opcodes:
-@if opcodes-bootstrap
-maybe-all-stageb2g0-opcodes: all-stageb2g0-opcodes
-all-stageb2g0: all-stageb2g0-opcodes
-TARGET-stageb2g0-opcodes = $(TARGET-opcodes)
-all-stageb2g0-opcodes: configure-stageb2g0-opcodes
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-opcodes
-clean-stageb2g0-opcodes:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-opcodes/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif opcodes-bootstrap
-
-
 .PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
 .PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
 maybe-all-stage3-opcodes:
@@ -6294,14 +6194,19 @@ all-stage3-opcodes: configure-stage3-opcodes
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-opcodes)
 
 maybe-clean-stage3-opcodes: clean-stage3-opcodes
@@ -6320,44 +6225,6 @@ clean-stage3-opcodes:
 @endif opcodes-bootstrap
 
 
-.PHONY: all-stageb3g2-opcodes maybe-all-stageb3g2-opcodes
-.PHONY: clean-stageb3g2-opcodes maybe-clean-stageb3g2-opcodes
-maybe-all-stageb3g2-opcodes:
-maybe-clean-stageb3g2-opcodes:
-@if opcodes-bootstrap
-maybe-all-stageb3g2-opcodes: all-stageb3g2-opcodes
-all-stageb3g2: all-stageb3g2-opcodes
-TARGET-stageb3g2-opcodes = $(TARGET-opcodes)
-all-stageb3g2-opcodes: configure-stageb3g2-opcodes
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-opcodes
-clean-stageb3g2-opcodes:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-opcodes/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif opcodes-bootstrap
-
-
 .PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
 .PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
 maybe-all-stage4-opcodes:
@@ -6370,14 +6237,19 @@ all-stage4-opcodes: configure-stage4-opcodes
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-opcodes)
 
 maybe-clean-stage4-opcodes: clean-stage4-opcodes
@@ -6408,14 +6280,19 @@ all-stageprofile-opcodes: configure-stageprofile-opcodes
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-opcodes)
 
 maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
@@ -6446,14 +6323,19 @@ all-stagefeedback-opcodes: configure-stagefeedback-opcodes
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-opcodes)
 
 maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
@@ -6872,10 +6754,12 @@ configure-stage1-binutils:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
 	cd $(HOST_SUBDIR)/binutils || exit 1; \
@@ -6889,8 +6773,7 @@ configure-stage1-binutils:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
 .PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
@@ -6902,11 +6785,13 @@ configure-stage2-binutils:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
 	cd $(HOST_SUBDIR)/binutils || exit 1; \
@@ -6921,38 +6806,7 @@ configure-stage2-binutils:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stageb2g0-binutils maybe-configure-stageb2g0-binutils
-maybe-configure-stageb2g0-binutils:
-@if binutils-bootstrap
-maybe-configure-stageb2g0-binutils: configure-stageb2g0-binutils
-configure-stageb2g0-binutils:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
 .PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
@@ -6964,11 +6818,13 @@ configure-stage3-binutils:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
 	cd $(HOST_SUBDIR)/binutils || exit 1; \
@@ -6983,38 +6839,7 @@ configure-stage3-binutils:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stageb3g2-binutils maybe-configure-stageb3g2-binutils
-maybe-configure-stageb3g2-binutils:
-@if binutils-bootstrap
-maybe-configure-stageb3g2-binutils: configure-stageb3g2-binutils
-configure-stageb3g2-binutils:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
 .PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
@@ -7026,11 +6851,13 @@ configure-stage4-binutils:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
 	cd $(HOST_SUBDIR)/binutils || exit 1; \
@@ -7045,7 +6872,7 @@ configure-stage4-binutils:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
 .PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
@@ -7057,11 +6884,13 @@ configure-stageprofile-binutils:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
 	cd $(HOST_SUBDIR)/binutils || exit 1; \
@@ -7076,7 +6905,7 @@ configure-stageprofile-binutils:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
 .PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
@@ -7088,11 +6917,13 @@ configure-stagefeedback-binutils:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
 	cd $(HOST_SUBDIR)/binutils || exit 1; \
@@ -7107,7 +6938,7 @@ configure-stagefeedback-binutils:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
 
@@ -7145,13 +6976,18 @@ all-stage1-binutils: configure-stage1-binutils
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-binutils)
 
 maybe-clean-stage1-binutils: clean-stage1-binutils
@@ -7181,14 +7017,19 @@ all-stage2-binutils: configure-stage2-binutils
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-binutils)
 
 maybe-clean-stage2-binutils: clean-stage2-binutils
@@ -7207,44 +7048,6 @@ clean-stage2-binutils:
 @endif binutils-bootstrap
 
 
-.PHONY: all-stageb2g0-binutils maybe-all-stageb2g0-binutils
-.PHONY: clean-stageb2g0-binutils maybe-clean-stageb2g0-binutils
-maybe-all-stageb2g0-binutils:
-maybe-clean-stageb2g0-binutils:
-@if binutils-bootstrap
-maybe-all-stageb2g0-binutils: all-stageb2g0-binutils
-all-stageb2g0: all-stageb2g0-binutils
-TARGET-stageb2g0-binutils = $(TARGET-binutils)
-all-stageb2g0-binutils: configure-stageb2g0-binutils
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-binutils
-clean-stageb2g0-binutils:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-binutils/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif binutils-bootstrap
-
-
 .PHONY: all-stage3-binutils maybe-all-stage3-binutils
 .PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
 maybe-all-stage3-binutils:
@@ -7257,14 +7060,19 @@ all-stage3-binutils: configure-stage3-binutils
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-binutils)
 
 maybe-clean-stage3-binutils: clean-stage3-binutils
@@ -7283,44 +7091,6 @@ clean-stage3-binutils:
 @endif binutils-bootstrap
 
 
-.PHONY: all-stageb3g2-binutils maybe-all-stageb3g2-binutils
-.PHONY: clean-stageb3g2-binutils maybe-clean-stageb3g2-binutils
-maybe-all-stageb3g2-binutils:
-maybe-clean-stageb3g2-binutils:
-@if binutils-bootstrap
-maybe-all-stageb3g2-binutils: all-stageb3g2-binutils
-all-stageb3g2: all-stageb3g2-binutils
-TARGET-stageb3g2-binutils = $(TARGET-binutils)
-all-stageb3g2-binutils: configure-stageb3g2-binutils
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-binutils
-clean-stageb3g2-binutils:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-binutils/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif binutils-bootstrap
-
-
 .PHONY: all-stage4-binutils maybe-all-stage4-binutils
 .PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
 maybe-all-stage4-binutils:
@@ -7333,14 +7103,19 @@ all-stage4-binutils: configure-stage4-binutils
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-binutils)
 
 maybe-clean-stage4-binutils: clean-stage4-binutils
@@ -7371,14 +7146,19 @@ all-stageprofile-binutils: configure-stageprofile-binutils
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-binutils)
 
 maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
@@ -7409,14 +7189,19 @@ all-stagefeedback-binutils: configure-stagefeedback-binutils
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-binutils)
 
 maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
@@ -13350,10 +13135,12 @@ configure-stage1-gas:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
 	cd $(HOST_SUBDIR)/gas || exit 1; \
@@ -13367,8 +13154,7 @@ configure-stage1-gas:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
 .PHONY: configure-stage2-gas maybe-configure-stage2-gas
@@ -13380,11 +13166,13 @@ configure-stage2-gas:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
 	cd $(HOST_SUBDIR)/gas || exit 1; \
@@ -13399,38 +13187,7 @@ configure-stage2-gas:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stageb2g0-gas maybe-configure-stageb2g0-gas
-maybe-configure-stageb2g0-gas:
-@if gas-bootstrap
-maybe-configure-stageb2g0-gas: configure-stageb2g0-gas
-configure-stageb2g0-gas:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
 .PHONY: configure-stage3-gas maybe-configure-stage3-gas
@@ -13442,11 +13199,13 @@ configure-stage3-gas:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
 	cd $(HOST_SUBDIR)/gas || exit 1; \
@@ -13461,38 +13220,7 @@ configure-stage3-gas:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stageb3g2-gas maybe-configure-stageb3g2-gas
-maybe-configure-stageb3g2-gas:
-@if gas-bootstrap
-maybe-configure-stageb3g2-gas: configure-stageb3g2-gas
-configure-stageb3g2-gas:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
 .PHONY: configure-stage4-gas maybe-configure-stage4-gas
@@ -13504,11 +13232,13 @@ configure-stage4-gas:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
 	cd $(HOST_SUBDIR)/gas || exit 1; \
@@ -13523,7 +13253,7 @@ configure-stage4-gas:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
 .PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
@@ -13535,11 +13265,13 @@ configure-stageprofile-gas:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
 	cd $(HOST_SUBDIR)/gas || exit 1; \
@@ -13554,7 +13286,7 @@ configure-stageprofile-gas:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
 .PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
@@ -13566,11 +13298,13 @@ configure-stagefeedback-gas:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
 	cd $(HOST_SUBDIR)/gas || exit 1; \
@@ -13585,7 +13319,7 @@ configure-stagefeedback-gas:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
 
@@ -13623,13 +13357,18 @@ all-stage1-gas: configure-stage1-gas
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-gas)
 
 maybe-clean-stage1-gas: clean-stage1-gas
@@ -13659,14 +13398,19 @@ all-stage2-gas: configure-stage2-gas
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-gas)
 
 maybe-clean-stage2-gas: clean-stage2-gas
@@ -13685,44 +13429,6 @@ clean-stage2-gas:
 @endif gas-bootstrap
 
 
-.PHONY: all-stageb2g0-gas maybe-all-stageb2g0-gas
-.PHONY: clean-stageb2g0-gas maybe-clean-stageb2g0-gas
-maybe-all-stageb2g0-gas:
-maybe-clean-stageb2g0-gas:
-@if gas-bootstrap
-maybe-all-stageb2g0-gas: all-stageb2g0-gas
-all-stageb2g0: all-stageb2g0-gas
-TARGET-stageb2g0-gas = $(TARGET-gas)
-all-stageb2g0-gas: configure-stageb2g0-gas
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-gas
-clean-stageb2g0-gas:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-gas/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif gas-bootstrap
-
-
 .PHONY: all-stage3-gas maybe-all-stage3-gas
 .PHONY: clean-stage3-gas maybe-clean-stage3-gas
 maybe-all-stage3-gas:
@@ -13735,14 +13441,19 @@ all-stage3-gas: configure-stage3-gas
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-gas)
 
 maybe-clean-stage3-gas: clean-stage3-gas
@@ -13761,44 +13472,6 @@ clean-stage3-gas:
 @endif gas-bootstrap
 
 
-.PHONY: all-stageb3g2-gas maybe-all-stageb3g2-gas
-.PHONY: clean-stageb3g2-gas maybe-clean-stageb3g2-gas
-maybe-all-stageb3g2-gas:
-maybe-clean-stageb3g2-gas:
-@if gas-bootstrap
-maybe-all-stageb3g2-gas: all-stageb3g2-gas
-all-stageb3g2: all-stageb3g2-gas
-TARGET-stageb3g2-gas = $(TARGET-gas)
-all-stageb3g2-gas: configure-stageb3g2-gas
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-gas
-clean-stageb3g2-gas:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-gas/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif gas-bootstrap
-
-
 .PHONY: all-stage4-gas maybe-all-stage4-gas
 .PHONY: clean-stage4-gas maybe-clean-stage4-gas
 maybe-all-stage4-gas:
@@ -13811,14 +13484,19 @@ all-stage4-gas: configure-stage4-gas
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-gas)
 
 maybe-clean-stage4-gas: clean-stage4-gas
@@ -13849,14 +13527,19 @@ all-stageprofile-gas: configure-stageprofile-gas
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-gas)
 
 maybe-clean-stageprofile-gas: clean-stageprofile-gas
@@ -13887,14 +13570,19 @@ all-stagefeedback-gas: configure-stagefeedback-gas
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-gas)
 
 maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
@@ -14313,10 +14001,12 @@ configure-stage1-gcc:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
 	cd $(HOST_SUBDIR)/gcc || exit 1; \
@@ -14330,8 +14020,7 @@ configure-stage1-gcc:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
 .PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
@@ -14343,11 +14032,13 @@ configure-stage2-gcc:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
 	cd $(HOST_SUBDIR)/gcc || exit 1; \
@@ -14362,38 +14053,7 @@ configure-stage2-gcc:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stageb2g0-gcc maybe-configure-stageb2g0-gcc
-maybe-configure-stageb2g0-gcc:
-@if gcc-bootstrap
-maybe-configure-stageb2g0-gcc: configure-stageb2g0-gcc
-configure-stageb2g0-gcc:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
 .PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
@@ -14405,11 +14065,13 @@ configure-stage3-gcc:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
 	cd $(HOST_SUBDIR)/gcc || exit 1; \
@@ -14424,38 +14086,7 @@ configure-stage3-gcc:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stageb3g2-gcc maybe-configure-stageb3g2-gcc
-maybe-configure-stageb3g2-gcc:
-@if gcc-bootstrap
-maybe-configure-stageb3g2-gcc: configure-stageb3g2-gcc
-configure-stageb3g2-gcc:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
 .PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
@@ -14467,11 +14098,13 @@ configure-stage4-gcc:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
 	cd $(HOST_SUBDIR)/gcc || exit 1; \
@@ -14486,7 +14119,7 @@ configure-stage4-gcc:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
 .PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
@@ -14498,11 +14131,13 @@ configure-stageprofile-gcc:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
 	cd $(HOST_SUBDIR)/gcc || exit 1; \
@@ -14517,7 +14152,7 @@ configure-stageprofile-gcc:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
 .PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
@@ -14529,11 +14164,13 @@ configure-stagefeedback-gcc:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
 	cd $(HOST_SUBDIR)/gcc || exit 1; \
@@ -14548,7 +14185,7 @@ configure-stagefeedback-gcc:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
 
@@ -14586,13 +14223,18 @@ all-stage1-gcc: configure-stage1-gcc
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(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) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)  $(EXTRA_GCC_FLAGS) \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-gcc)
 
 maybe-clean-stage1-gcc: clean-stage1-gcc
@@ -14622,14 +14264,19 @@ all-stage2-gcc: configure-stage2-gcc
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(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) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-gcc)
 
 maybe-clean-stage2-gcc: clean-stage2-gcc
@@ -14648,44 +14295,6 @@ clean-stage2-gcc:
 @endif gcc-bootstrap
 
 
-.PHONY: all-stageb2g0-gcc maybe-all-stageb2g0-gcc
-.PHONY: clean-stageb2g0-gcc maybe-clean-stageb2g0-gcc
-maybe-all-stageb2g0-gcc:
-maybe-clean-stageb2g0-gcc:
-@if gcc-bootstrap
-maybe-all-stageb2g0-gcc: all-stageb2g0-gcc
-all-stageb2g0: all-stageb2g0-gcc
-TARGET-stageb2g0-gcc = $(TARGET-gcc)
-all-stageb2g0-gcc: configure-stageb2g0-gcc
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-gcc
-clean-stageb2g0-gcc:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-gcc/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		$(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
 .PHONY: all-stage3-gcc maybe-all-stage3-gcc
 .PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
 maybe-all-stage3-gcc:
@@ -14698,14 +14307,19 @@ all-stage3-gcc: configure-stage3-gcc
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(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) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-gcc)
 
 maybe-clean-stage3-gcc: clean-stage3-gcc
@@ -14724,44 +14338,6 @@ clean-stage3-gcc:
 @endif gcc-bootstrap
 
 
-.PHONY: all-stageb3g2-gcc maybe-all-stageb3g2-gcc
-.PHONY: clean-stageb3g2-gcc maybe-clean-stageb3g2-gcc
-maybe-all-stageb3g2-gcc:
-maybe-clean-stageb3g2-gcc:
-@if gcc-bootstrap
-maybe-all-stageb3g2-gcc: all-stageb3g2-gcc
-all-stageb3g2: all-stageb3g2-gcc
-TARGET-stageb3g2-gcc = $(TARGET-gcc)
-all-stageb3g2-gcc: configure-stageb3g2-gcc
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-gcc
-clean-stageb3g2-gcc:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-gcc/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		$(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
 .PHONY: all-stage4-gcc maybe-all-stage4-gcc
 .PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
 maybe-all-stage4-gcc:
@@ -14774,14 +14350,19 @@ all-stage4-gcc: configure-stage4-gcc
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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) \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-gcc)
 
 maybe-clean-stage4-gcc: clean-stage4-gcc
@@ -14812,14 +14393,19 @@ all-stageprofile-gcc: configure-stageprofile-gcc
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-gcc)
 
 maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
@@ -14850,14 +14436,19 @@ all-stagefeedback-gcc: configure-stagefeedback-gcc
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(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) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-gcc)
 
 maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
@@ -16126,10 +15717,12 @@ configure-stage1-gmp:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -16143,8 +15736,8 @@ configure-stage1-gmp:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared
+	  $(STAGE1_CONFIGURE_FLAGS) \
+	  --disable-shared
 @endif gmp-bootstrap
 
 .PHONY: configure-stage2-gmp maybe-configure-stage2-gmp
@@ -16156,11 +15749,13 @@ configure-stage2-gmp:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -16175,38 +15770,8 @@ configure-stage2-gmp:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared
-@endif gmp-bootstrap
-
-.PHONY: configure-stageb2g0-gmp maybe-configure-stageb2g0-gmp
-maybe-configure-stageb2g0-gmp:
-@if gmp-bootstrap
-maybe-configure-stageb2g0-gmp: configure-stageb2g0-gmp
-configure-stageb2g0-gmp:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gmp"; \
-	libsrcdir="$$s/gmp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared
+	  $(STAGE2_CONFIGURE_FLAGS) \
+	  --disable-shared
 @endif gmp-bootstrap
 
 .PHONY: configure-stage3-gmp maybe-configure-stage3-gmp
@@ -16218,11 +15783,13 @@ configure-stage3-gmp:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -16237,38 +15804,8 @@ configure-stage3-gmp:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared
-@endif gmp-bootstrap
-
-.PHONY: configure-stageb3g2-gmp maybe-configure-stageb3g2-gmp
-maybe-configure-stageb3g2-gmp:
-@if gmp-bootstrap
-maybe-configure-stageb3g2-gmp: configure-stageb3g2-gmp
-configure-stageb3g2-gmp:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gmp"; \
-	libsrcdir="$$s/gmp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared
+	  $(STAGE3_CONFIGURE_FLAGS) \
+	  --disable-shared
 @endif gmp-bootstrap
 
 .PHONY: configure-stage4-gmp maybe-configure-stage4-gmp
@@ -16280,11 +15817,13 @@ configure-stage4-gmp:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -16299,7 +15838,8 @@ configure-stage4-gmp:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared
+	  $(STAGE4_CONFIGURE_FLAGS) \
+	  --disable-shared
 @endif gmp-bootstrap
 
 .PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp
@@ -16311,11 +15851,13 @@ configure-stageprofile-gmp:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -16330,7 +15872,8 @@ configure-stageprofile-gmp:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared
+	  $(STAGEprofile_CONFIGURE_FLAGS) \
+	  --disable-shared
 @endif gmp-bootstrap
 
 .PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp
@@ -16342,11 +15885,13 @@ configure-stagefeedback-gmp:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -16361,7 +15906,8 @@ configure-stagefeedback-gmp:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared
+	  $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  --disable-shared
 @endif gmp-bootstrap
 
 
@@ -16399,13 +15945,18 @@ all-stage1-gmp: configure-stage1-gmp
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gmp && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-gmp)
 
 maybe-clean-stage1-gmp: clean-stage1-gmp
@@ -16435,14 +15986,19 @@ all-stage2-gmp: configure-stage2-gmp
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gmp && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-gmp)
 
 maybe-clean-stage2-gmp: clean-stage2-gmp
@@ -16461,44 +16017,6 @@ clean-stage2-gmp:
 @endif gmp-bootstrap
 
 
-.PHONY: all-stageb2g0-gmp maybe-all-stageb2g0-gmp
-.PHONY: clean-stageb2g0-gmp maybe-clean-stageb2g0-gmp
-maybe-all-stageb2g0-gmp:
-maybe-clean-stageb2g0-gmp:
-@if gmp-bootstrap
-maybe-all-stageb2g0-gmp: all-stageb2g0-gmp
-all-stageb2g0: all-stageb2g0-gmp
-TARGET-stageb2g0-gmp = $(TARGET-gmp)
-all-stageb2g0-gmp: configure-stageb2g0-gmp
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gmp && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-gmp
-clean-stageb2g0-gmp:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-gmp/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif gmp-bootstrap
-
-
 .PHONY: all-stage3-gmp maybe-all-stage3-gmp
 .PHONY: clean-stage3-gmp maybe-clean-stage3-gmp
 maybe-all-stage3-gmp:
@@ -16511,14 +16029,19 @@ all-stage3-gmp: configure-stage3-gmp
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gmp && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-gmp)
 
 maybe-clean-stage3-gmp: clean-stage3-gmp
@@ -16537,44 +16060,6 @@ clean-stage3-gmp:
 @endif gmp-bootstrap
 
 
-.PHONY: all-stageb3g2-gmp maybe-all-stageb3g2-gmp
-.PHONY: clean-stageb3g2-gmp maybe-clean-stageb3g2-gmp
-maybe-all-stageb3g2-gmp:
-maybe-clean-stageb3g2-gmp:
-@if gmp-bootstrap
-maybe-all-stageb3g2-gmp: all-stageb3g2-gmp
-all-stageb3g2: all-stageb3g2-gmp
-TARGET-stageb3g2-gmp = $(TARGET-gmp)
-all-stageb3g2-gmp: configure-stageb3g2-gmp
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gmp && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-gmp
-clean-stageb3g2-gmp:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-gmp/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif gmp-bootstrap
-
-
 .PHONY: all-stage4-gmp maybe-all-stage4-gmp
 .PHONY: clean-stage4-gmp maybe-clean-stage4-gmp
 maybe-all-stage4-gmp:
@@ -16587,14 +16072,19 @@ all-stage4-gmp: configure-stage4-gmp
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gmp && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-gmp)
 
 maybe-clean-stage4-gmp: clean-stage4-gmp
@@ -16625,14 +16115,19 @@ all-stageprofile-gmp: configure-stageprofile-gmp
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gmp && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-gmp)
 
 maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
@@ -16663,14 +16158,19 @@ all-stagefeedback-gmp: configure-stagefeedback-gmp
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gmp && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-gmp)
 
 maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
@@ -17083,10 +16583,12 @@ configure-stage1-mpfr:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -17100,8 +16602,8 @@ configure-stage1-mpfr:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared @extra_mpfr_configure_flags@
+	  $(STAGE1_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
 .PHONY: configure-stage2-mpfr maybe-configure-stage2-mpfr
@@ -17113,11 +16615,13 @@ configure-stage2-mpfr:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -17132,38 +16636,8 @@ configure-stage2-mpfr:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
-@endif mpfr-bootstrap
-
-.PHONY: configure-stageb2g0-mpfr maybe-configure-stageb2g0-mpfr
-maybe-configure-stageb2g0-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stageb2g0-mpfr: configure-stageb2g0-mpfr
-configure-stageb2g0-mpfr:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/mpfr"; \
-	libsrcdir="$$s/mpfr"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
+	  $(STAGE2_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
 .PHONY: configure-stage3-mpfr maybe-configure-stage3-mpfr
@@ -17175,11 +16649,13 @@ configure-stage3-mpfr:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -17194,38 +16670,8 @@ configure-stage3-mpfr:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
-@endif mpfr-bootstrap
-
-.PHONY: configure-stageb3g2-mpfr maybe-configure-stageb3g2-mpfr
-maybe-configure-stageb3g2-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stageb3g2-mpfr: configure-stageb3g2-mpfr
-configure-stageb3g2-mpfr:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/mpfr"; \
-	libsrcdir="$$s/mpfr"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
+	  $(STAGE3_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
 .PHONY: configure-stage4-mpfr maybe-configure-stage4-mpfr
@@ -17237,11 +16683,13 @@ configure-stage4-mpfr:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -17256,7 +16704,8 @@ configure-stage4-mpfr:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
+	  $(STAGE4_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
 .PHONY: configure-stageprofile-mpfr maybe-configure-stageprofile-mpfr
@@ -17268,11 +16717,13 @@ configure-stageprofile-mpfr:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -17287,7 +16738,8 @@ configure-stageprofile-mpfr:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
+	  $(STAGEprofile_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
 .PHONY: configure-stagefeedback-mpfr maybe-configure-stagefeedback-mpfr
@@ -17299,11 +16751,13 @@ configure-stagefeedback-mpfr:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -17318,7 +16772,8 @@ configure-stagefeedback-mpfr:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
+	  $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
 
@@ -17356,13 +16811,18 @@ all-stage1-mpfr: configure-stage1-mpfr
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/mpfr && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-mpfr)
 
 maybe-clean-stage1-mpfr: clean-stage1-mpfr
@@ -17392,14 +16852,19 @@ all-stage2-mpfr: configure-stage2-mpfr
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/mpfr && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-mpfr)
 
 maybe-clean-stage2-mpfr: clean-stage2-mpfr
@@ -17418,44 +16883,6 @@ clean-stage2-mpfr:
 @endif mpfr-bootstrap
 
 
-.PHONY: all-stageb2g0-mpfr maybe-all-stageb2g0-mpfr
-.PHONY: clean-stageb2g0-mpfr maybe-clean-stageb2g0-mpfr
-maybe-all-stageb2g0-mpfr:
-maybe-clean-stageb2g0-mpfr:
-@if mpfr-bootstrap
-maybe-all-stageb2g0-mpfr: all-stageb2g0-mpfr
-all-stageb2g0: all-stageb2g0-mpfr
-TARGET-stageb2g0-mpfr = $(TARGET-mpfr)
-all-stageb2g0-mpfr: configure-stageb2g0-mpfr
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/mpfr && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-mpfr
-clean-stageb2g0-mpfr:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-mpfr/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif mpfr-bootstrap
-
-
 .PHONY: all-stage3-mpfr maybe-all-stage3-mpfr
 .PHONY: clean-stage3-mpfr maybe-clean-stage3-mpfr
 maybe-all-stage3-mpfr:
@@ -17468,14 +16895,19 @@ all-stage3-mpfr: configure-stage3-mpfr
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/mpfr && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-mpfr)
 
 maybe-clean-stage3-mpfr: clean-stage3-mpfr
@@ -17494,44 +16926,6 @@ clean-stage3-mpfr:
 @endif mpfr-bootstrap
 
 
-.PHONY: all-stageb3g2-mpfr maybe-all-stageb3g2-mpfr
-.PHONY: clean-stageb3g2-mpfr maybe-clean-stageb3g2-mpfr
-maybe-all-stageb3g2-mpfr:
-maybe-clean-stageb3g2-mpfr:
-@if mpfr-bootstrap
-maybe-all-stageb3g2-mpfr: all-stageb3g2-mpfr
-all-stageb3g2: all-stageb3g2-mpfr
-TARGET-stageb3g2-mpfr = $(TARGET-mpfr)
-all-stageb3g2-mpfr: configure-stageb3g2-mpfr
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/mpfr && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-mpfr
-clean-stageb3g2-mpfr:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-mpfr/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif mpfr-bootstrap
-
-
 .PHONY: all-stage4-mpfr maybe-all-stage4-mpfr
 .PHONY: clean-stage4-mpfr maybe-clean-stage4-mpfr
 maybe-all-stage4-mpfr:
@@ -17544,14 +16938,19 @@ all-stage4-mpfr: configure-stage4-mpfr
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/mpfr && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-mpfr)
 
 maybe-clean-stage4-mpfr: clean-stage4-mpfr
@@ -17582,14 +16981,19 @@ all-stageprofile-mpfr: configure-stageprofile-mpfr
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/mpfr && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-mpfr)
 
 maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
@@ -17620,14 +17024,19 @@ all-stagefeedback-mpfr: configure-stagefeedback-mpfr
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/mpfr && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-mpfr)
 
 maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
@@ -18040,10 +17449,12 @@ configure-stage1-ppl:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/ppl ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
 	cd $(HOST_SUBDIR)/ppl || exit 1; \
@@ -18057,8 +17468,8 @@ configure-stage1-ppl:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+	  $(STAGE1_CONFIGURE_FLAGS) \
+	  --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
 @endif ppl-bootstrap
 
 .PHONY: configure-stage2-ppl maybe-configure-stage2-ppl
@@ -18070,11 +17481,13 @@ configure-stage2-ppl:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/ppl ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
 	cd $(HOST_SUBDIR)/ppl || exit 1; \
@@ -18089,38 +17502,8 @@ configure-stage2-ppl:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
-@endif ppl-bootstrap
-
-.PHONY: configure-stageb2g0-ppl maybe-configure-stageb2g0-ppl
-maybe-configure-stageb2g0-ppl:
-@if ppl-bootstrap
-maybe-configure-stageb2g0-ppl: configure-stageb2g0-ppl
-configure-stageb2g0-ppl:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-	echo Configuring stage b2g0 in $(HOST_SUBDIR)/ppl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
-	cd $(HOST_SUBDIR)/ppl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ppl"; \
-	libsrcdir="$$s/ppl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+	  $(STAGE2_CONFIGURE_FLAGS) \
+	  --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
 @endif ppl-bootstrap
 
 .PHONY: configure-stage3-ppl maybe-configure-stage3-ppl
@@ -18132,11 +17515,13 @@ configure-stage3-ppl:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/ppl ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
 	cd $(HOST_SUBDIR)/ppl || exit 1; \
@@ -18151,38 +17536,8 @@ configure-stage3-ppl:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
-@endif ppl-bootstrap
-
-.PHONY: configure-stageb3g2-ppl maybe-configure-stageb3g2-ppl
-maybe-configure-stageb3g2-ppl:
-@if ppl-bootstrap
-maybe-configure-stageb3g2-ppl: configure-stageb3g2-ppl
-configure-stageb3g2-ppl:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-	echo Configuring stage b3g2 in $(HOST_SUBDIR)/ppl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
-	cd $(HOST_SUBDIR)/ppl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ppl"; \
-	libsrcdir="$$s/ppl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+	  $(STAGE3_CONFIGURE_FLAGS) \
+	  --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
 @endif ppl-bootstrap
 
 .PHONY: configure-stage4-ppl maybe-configure-stage4-ppl
@@ -18194,11 +17549,13 @@ configure-stage4-ppl:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/ppl ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
 	cd $(HOST_SUBDIR)/ppl || exit 1; \
@@ -18213,7 +17570,8 @@ configure-stage4-ppl:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+	  $(STAGE4_CONFIGURE_FLAGS) \
+	  --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
 @endif ppl-bootstrap
 
 .PHONY: configure-stageprofile-ppl maybe-configure-stageprofile-ppl
@@ -18225,11 +17583,13 @@ configure-stageprofile-ppl:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/ppl ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
 	cd $(HOST_SUBDIR)/ppl || exit 1; \
@@ -18244,7 +17604,8 @@ configure-stageprofile-ppl:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+	  $(STAGEprofile_CONFIGURE_FLAGS) \
+	  --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
 @endif ppl-bootstrap
 
 .PHONY: configure-stagefeedback-ppl maybe-configure-stagefeedback-ppl
@@ -18256,11 +17617,13 @@ configure-stagefeedback-ppl:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/ppl ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
 	cd $(HOST_SUBDIR)/ppl || exit 1; \
@@ -18275,7 +17638,8 @@ configure-stagefeedback-ppl:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+	  $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
 @endif ppl-bootstrap
 
 
@@ -18313,13 +17677,18 @@ all-stage1-ppl: configure-stage1-ppl
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ppl && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-ppl)
 
 maybe-clean-stage1-ppl: clean-stage1-ppl
@@ -18349,14 +17718,19 @@ all-stage2-ppl: configure-stage2-ppl
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ppl && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-ppl)
 
 maybe-clean-stage2-ppl: clean-stage2-ppl
@@ -18375,44 +17749,6 @@ clean-stage2-ppl:
 @endif ppl-bootstrap
 
 
-.PHONY: all-stageb2g0-ppl maybe-all-stageb2g0-ppl
-.PHONY: clean-stageb2g0-ppl maybe-clean-stageb2g0-ppl
-maybe-all-stageb2g0-ppl:
-maybe-clean-stageb2g0-ppl:
-@if ppl-bootstrap
-maybe-all-stageb2g0-ppl: all-stageb2g0-ppl
-all-stageb2g0: all-stageb2g0-ppl
-TARGET-stageb2g0-ppl = $(TARGET-ppl)
-all-stageb2g0-ppl: configure-stageb2g0-ppl
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ppl && \
-	$(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-ppl)
-
-maybe-clean-stageb2g0-ppl: clean-stageb2g0-ppl
-clean-stageb2g0: clean-stageb2g0-ppl
-clean-stageb2g0-ppl:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-ppl/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/ppl && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif ppl-bootstrap
-
-
 .PHONY: all-stage3-ppl maybe-all-stage3-ppl
 .PHONY: clean-stage3-ppl maybe-clean-stage3-ppl
 maybe-all-stage3-ppl:
@@ -18425,14 +17761,19 @@ all-stage3-ppl: configure-stage3-ppl
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ppl && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-ppl)
 
 maybe-clean-stage3-ppl: clean-stage3-ppl
@@ -18451,44 +17792,6 @@ clean-stage3-ppl:
 @endif ppl-bootstrap
 
 
-.PHONY: all-stageb3g2-ppl maybe-all-stageb3g2-ppl
-.PHONY: clean-stageb3g2-ppl maybe-clean-stageb3g2-ppl
-maybe-all-stageb3g2-ppl:
-maybe-clean-stageb3g2-ppl:
-@if ppl-bootstrap
-maybe-all-stageb3g2-ppl: all-stageb3g2-ppl
-all-stageb3g2: all-stageb3g2-ppl
-TARGET-stageb3g2-ppl = $(TARGET-ppl)
-all-stageb3g2-ppl: configure-stageb3g2-ppl
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ppl && \
-	$(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-ppl)
-
-maybe-clean-stageb3g2-ppl: clean-stageb3g2-ppl
-clean-stageb3g2: clean-stageb3g2-ppl
-clean-stageb3g2-ppl:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-ppl/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/ppl && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif ppl-bootstrap
-
-
 .PHONY: all-stage4-ppl maybe-all-stage4-ppl
 .PHONY: clean-stage4-ppl maybe-clean-stage4-ppl
 maybe-all-stage4-ppl:
@@ -18501,14 +17804,19 @@ all-stage4-ppl: configure-stage4-ppl
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ppl && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-ppl)
 
 maybe-clean-stage4-ppl: clean-stage4-ppl
@@ -18539,14 +17847,19 @@ all-stageprofile-ppl: configure-stageprofile-ppl
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ppl && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-ppl)
 
 maybe-clean-stageprofile-ppl: clean-stageprofile-ppl
@@ -18577,14 +17890,19 @@ all-stagefeedback-ppl: configure-stagefeedback-ppl
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ppl && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-ppl)
 
 maybe-clean-stagefeedback-ppl: clean-stagefeedback-ppl
@@ -18997,10 +18315,12 @@ configure-stage1-cloog:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/cloog ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
 	cd $(HOST_SUBDIR)/cloog || exit 1; \
@@ -19014,8 +18334,8 @@ configure-stage1-cloog:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
+	  $(STAGE1_CONFIGURE_FLAGS) \
+	  --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
 @endif cloog-bootstrap
 
 .PHONY: configure-stage2-cloog maybe-configure-stage2-cloog
@@ -19027,11 +18347,13 @@ configure-stage2-cloog:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/cloog ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
 	cd $(HOST_SUBDIR)/cloog || exit 1; \
@@ -19046,38 +18368,8 @@ configure-stage2-cloog:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
-@endif cloog-bootstrap
-
-.PHONY: configure-stageb2g0-cloog maybe-configure-stageb2g0-cloog
-maybe-configure-stageb2g0-cloog:
-@if cloog-bootstrap
-maybe-configure-stageb2g0-cloog: configure-stageb2g0-cloog
-configure-stageb2g0-cloog:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-	echo Configuring stage b2g0 in $(HOST_SUBDIR)/cloog ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-	cd $(HOST_SUBDIR)/cloog || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/cloog"; \
-	libsrcdir="$$s/cloog"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
+	  $(STAGE2_CONFIGURE_FLAGS) \
+	  --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
 @endif cloog-bootstrap
 
 .PHONY: configure-stage3-cloog maybe-configure-stage3-cloog
@@ -19089,11 +18381,13 @@ configure-stage3-cloog:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/cloog ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
 	cd $(HOST_SUBDIR)/cloog || exit 1; \
@@ -19108,38 +18402,8 @@ configure-stage3-cloog:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
-@endif cloog-bootstrap
-
-.PHONY: configure-stageb3g2-cloog maybe-configure-stageb3g2-cloog
-maybe-configure-stageb3g2-cloog:
-@if cloog-bootstrap
-maybe-configure-stageb3g2-cloog: configure-stageb3g2-cloog
-configure-stageb3g2-cloog:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-	echo Configuring stage b3g2 in $(HOST_SUBDIR)/cloog ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-	cd $(HOST_SUBDIR)/cloog || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/cloog"; \
-	libsrcdir="$$s/cloog"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
+	  $(STAGE3_CONFIGURE_FLAGS) \
+	  --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
 @endif cloog-bootstrap
 
 .PHONY: configure-stage4-cloog maybe-configure-stage4-cloog
@@ -19151,11 +18415,13 @@ configure-stage4-cloog:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/cloog ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
 	cd $(HOST_SUBDIR)/cloog || exit 1; \
@@ -19170,7 +18436,8 @@ configure-stage4-cloog:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
+	  $(STAGE4_CONFIGURE_FLAGS) \
+	  --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
 @endif cloog-bootstrap
 
 .PHONY: configure-stageprofile-cloog maybe-configure-stageprofile-cloog
@@ -19182,11 +18449,13 @@ configure-stageprofile-cloog:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/cloog ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
 	cd $(HOST_SUBDIR)/cloog || exit 1; \
@@ -19201,7 +18470,8 @@ configure-stageprofile-cloog:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
+	  $(STAGEprofile_CONFIGURE_FLAGS) \
+	  --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
 @endif cloog-bootstrap
 
 .PHONY: configure-stagefeedback-cloog maybe-configure-stagefeedback-cloog
@@ -19213,11 +18483,13 @@ configure-stagefeedback-cloog:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/cloog ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
 	cd $(HOST_SUBDIR)/cloog || exit 1; \
@@ -19232,7 +18504,8 @@ configure-stagefeedback-cloog:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
 	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
+	  $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp
 @endif cloog-bootstrap
 
 
@@ -19270,13 +18543,18 @@ all-stage1-cloog: configure-stage1-cloog
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/cloog && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-cloog)
 
 maybe-clean-stage1-cloog: clean-stage1-cloog
@@ -19306,14 +18584,19 @@ all-stage2-cloog: configure-stage2-cloog
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/cloog && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-cloog)
 
 maybe-clean-stage2-cloog: clean-stage2-cloog
@@ -19332,44 +18615,6 @@ clean-stage2-cloog:
 @endif cloog-bootstrap
 
 
-.PHONY: all-stageb2g0-cloog maybe-all-stageb2g0-cloog
-.PHONY: clean-stageb2g0-cloog maybe-clean-stageb2g0-cloog
-maybe-all-stageb2g0-cloog:
-maybe-clean-stageb2g0-cloog:
-@if cloog-bootstrap
-maybe-all-stageb2g0-cloog: all-stageb2g0-cloog
-all-stageb2g0: all-stageb2g0-cloog
-TARGET-stageb2g0-cloog = $(TARGET-cloog)
-all-stageb2g0-cloog: configure-stageb2g0-cloog
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/cloog && \
-	$(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-cloog)
-
-maybe-clean-stageb2g0-cloog: clean-stageb2g0-cloog
-clean-stageb2g0: clean-stageb2g0-cloog
-clean-stageb2g0-cloog:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-cloog/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/cloog && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif cloog-bootstrap
-
-
 .PHONY: all-stage3-cloog maybe-all-stage3-cloog
 .PHONY: clean-stage3-cloog maybe-clean-stage3-cloog
 maybe-all-stage3-cloog:
@@ -19382,14 +18627,19 @@ all-stage3-cloog: configure-stage3-cloog
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/cloog && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-cloog)
 
 maybe-clean-stage3-cloog: clean-stage3-cloog
@@ -19408,44 +18658,6 @@ clean-stage3-cloog:
 @endif cloog-bootstrap
 
 
-.PHONY: all-stageb3g2-cloog maybe-all-stageb3g2-cloog
-.PHONY: clean-stageb3g2-cloog maybe-clean-stageb3g2-cloog
-maybe-all-stageb3g2-cloog:
-maybe-clean-stageb3g2-cloog:
-@if cloog-bootstrap
-maybe-all-stageb3g2-cloog: all-stageb3g2-cloog
-all-stageb3g2: all-stageb3g2-cloog
-TARGET-stageb3g2-cloog = $(TARGET-cloog)
-all-stageb3g2-cloog: configure-stageb3g2-cloog
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/cloog && \
-	$(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-cloog)
-
-maybe-clean-stageb3g2-cloog: clean-stageb3g2-cloog
-clean-stageb3g2: clean-stageb3g2-cloog
-clean-stageb3g2-cloog:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-cloog/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/cloog && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif cloog-bootstrap
-
-
 .PHONY: all-stage4-cloog maybe-all-stage4-cloog
 .PHONY: clean-stage4-cloog maybe-clean-stage4-cloog
 maybe-all-stage4-cloog:
@@ -19458,14 +18670,19 @@ all-stage4-cloog: configure-stage4-cloog
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/cloog && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-cloog)
 
 maybe-clean-stage4-cloog: clean-stage4-cloog
@@ -19496,14 +18713,19 @@ all-stageprofile-cloog: configure-stageprofile-cloog
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/cloog && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-cloog)
 
 maybe-clean-stageprofile-cloog: clean-stageprofile-cloog
@@ -19534,14 +18756,19 @@ all-stagefeedback-cloog: configure-stagefeedback-cloog
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/cloog && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-cloog)
 
 maybe-clean-stagefeedback-cloog: clean-stagefeedback-cloog
@@ -20379,10 +19606,12 @@ configure-stage1-gold:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/gold ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
 	cd $(HOST_SUBDIR)/gold || exit 1; \
@@ -20396,8 +19625,7 @@ configure-stage1-gold:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
 .PHONY: configure-stage2-gold maybe-configure-stage2-gold
@@ -20409,11 +19637,13 @@ configure-stage2-gold:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/gold ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
 	cd $(HOST_SUBDIR)/gold || exit 1; \
@@ -20428,38 +19658,7 @@ configure-stage2-gold:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif gold-bootstrap
-
-.PHONY: configure-stageb2g0-gold maybe-configure-stageb2g0-gold
-maybe-configure-stageb2g0-gold:
-@if gold-bootstrap
-maybe-configure-stageb2g0-gold: configure-stageb2g0-gold
-configure-stageb2g0-gold:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-	echo Configuring stage b2g0 in $(HOST_SUBDIR)/gold ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-	cd $(HOST_SUBDIR)/gold || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gold"; \
-	libsrcdir="$$s/gold"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
 .PHONY: configure-stage3-gold maybe-configure-stage3-gold
@@ -20471,11 +19670,13 @@ configure-stage3-gold:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/gold ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
 	cd $(HOST_SUBDIR)/gold || exit 1; \
@@ -20490,38 +19691,7 @@ configure-stage3-gold:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif gold-bootstrap
-
-.PHONY: configure-stageb3g2-gold maybe-configure-stageb3g2-gold
-maybe-configure-stageb3g2-gold:
-@if gold-bootstrap
-maybe-configure-stageb3g2-gold: configure-stageb3g2-gold
-configure-stageb3g2-gold:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-	echo Configuring stage b3g2 in $(HOST_SUBDIR)/gold ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-	cd $(HOST_SUBDIR)/gold || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gold"; \
-	libsrcdir="$$s/gold"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
 .PHONY: configure-stage4-gold maybe-configure-stage4-gold
@@ -20533,11 +19703,13 @@ configure-stage4-gold:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/gold ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
 	cd $(HOST_SUBDIR)/gold || exit 1; \
@@ -20552,7 +19724,7 @@ configure-stage4-gold:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
 .PHONY: configure-stageprofile-gold maybe-configure-stageprofile-gold
@@ -20564,11 +19736,13 @@ configure-stageprofile-gold:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/gold ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
 	cd $(HOST_SUBDIR)/gold || exit 1; \
@@ -20583,7 +19757,7 @@ configure-stageprofile-gold:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
 .PHONY: configure-stagefeedback-gold maybe-configure-stagefeedback-gold
@@ -20595,11 +19769,13 @@ configure-stagefeedback-gold:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/gold ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
 	cd $(HOST_SUBDIR)/gold || exit 1; \
@@ -20614,7 +19790,7 @@ configure-stagefeedback-gold:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
 
@@ -20652,13 +19828,18 @@ all-stage1-gold: configure-stage1-gold
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gold && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-gold)
 
 maybe-clean-stage1-gold: clean-stage1-gold
@@ -20688,14 +19869,19 @@ all-stage2-gold: configure-stage2-gold
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gold && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-gold)
 
 maybe-clean-stage2-gold: clean-stage2-gold
@@ -20714,44 +19900,6 @@ clean-stage2-gold:
 @endif gold-bootstrap
 
 
-.PHONY: all-stageb2g0-gold maybe-all-stageb2g0-gold
-.PHONY: clean-stageb2g0-gold maybe-clean-stageb2g0-gold
-maybe-all-stageb2g0-gold:
-maybe-clean-stageb2g0-gold:
-@if gold-bootstrap
-maybe-all-stageb2g0-gold: all-stageb2g0-gold
-all-stageb2g0: all-stageb2g0-gold
-TARGET-stageb2g0-gold = $(TARGET-gold)
-all-stageb2g0-gold: configure-stageb2g0-gold
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gold && \
-	$(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-gold)
-
-maybe-clean-stageb2g0-gold: clean-stageb2g0-gold
-clean-stageb2g0: clean-stageb2g0-gold
-clean-stageb2g0-gold:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-gold/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gold && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif gold-bootstrap
-
-
 .PHONY: all-stage3-gold maybe-all-stage3-gold
 .PHONY: clean-stage3-gold maybe-clean-stage3-gold
 maybe-all-stage3-gold:
@@ -20764,14 +19912,19 @@ all-stage3-gold: configure-stage3-gold
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gold && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-gold)
 
 maybe-clean-stage3-gold: clean-stage3-gold
@@ -20790,44 +19943,6 @@ clean-stage3-gold:
 @endif gold-bootstrap
 
 
-.PHONY: all-stageb3g2-gold maybe-all-stageb3g2-gold
-.PHONY: clean-stageb3g2-gold maybe-clean-stageb3g2-gold
-maybe-all-stageb3g2-gold:
-maybe-clean-stageb3g2-gold:
-@if gold-bootstrap
-maybe-all-stageb3g2-gold: all-stageb3g2-gold
-all-stageb3g2: all-stageb3g2-gold
-TARGET-stageb3g2-gold = $(TARGET-gold)
-all-stageb3g2-gold: configure-stageb3g2-gold
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gold && \
-	$(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-gold)
-
-maybe-clean-stageb3g2-gold: clean-stageb3g2-gold
-clean-stageb3g2: clean-stageb3g2-gold
-clean-stageb3g2-gold:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-gold/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gold && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif gold-bootstrap
-
-
 .PHONY: all-stage4-gold maybe-all-stage4-gold
 .PHONY: clean-stage4-gold maybe-clean-stage4-gold
 maybe-all-stage4-gold:
@@ -20840,14 +19955,19 @@ all-stage4-gold: configure-stage4-gold
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gold && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-gold)
 
 maybe-clean-stage4-gold: clean-stage4-gold
@@ -20878,14 +19998,19 @@ all-stageprofile-gold: configure-stageprofile-gold
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gold && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-gold)
 
 maybe-clean-stageprofile-gold: clean-stageprofile-gold
@@ -20916,14 +20041,19 @@ all-stagefeedback-gold: configure-stagefeedback-gold
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gold && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-gold)
 
 maybe-clean-stagefeedback-gold: clean-stagefeedback-gold
@@ -23042,10 +22172,12 @@ configure-stage1-intl:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
 	cd $(HOST_SUBDIR)/intl || exit 1; \
@@ -23059,8 +22191,7 @@ configure-stage1-intl:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
 .PHONY: configure-stage2-intl maybe-configure-stage2-intl
@@ -23072,11 +22203,13 @@ configure-stage2-intl:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
 	cd $(HOST_SUBDIR)/intl || exit 1; \
@@ -23091,38 +22224,7 @@ configure-stage2-intl:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-.PHONY: configure-stageb2g0-intl maybe-configure-stageb2g0-intl
-maybe-configure-stageb2g0-intl:
-@if intl-bootstrap
-maybe-configure-stageb2g0-intl: configure-stageb2g0-intl
-configure-stageb2g0-intl:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
 .PHONY: configure-stage3-intl maybe-configure-stage3-intl
@@ -23134,11 +22236,13 @@ configure-stage3-intl:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
 	cd $(HOST_SUBDIR)/intl || exit 1; \
@@ -23153,38 +22257,7 @@ configure-stage3-intl:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-.PHONY: configure-stageb3g2-intl maybe-configure-stageb3g2-intl
-maybe-configure-stageb3g2-intl:
-@if intl-bootstrap
-maybe-configure-stageb3g2-intl: configure-stageb3g2-intl
-configure-stageb3g2-intl:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
 .PHONY: configure-stage4-intl maybe-configure-stage4-intl
@@ -23196,11 +22269,13 @@ configure-stage4-intl:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
 	cd $(HOST_SUBDIR)/intl || exit 1; \
@@ -23215,7 +22290,7 @@ configure-stage4-intl:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
 .PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
@@ -23227,11 +22302,13 @@ configure-stageprofile-intl:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
 	cd $(HOST_SUBDIR)/intl || exit 1; \
@@ -23246,7 +22323,7 @@ configure-stageprofile-intl:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
 .PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
@@ -23258,11 +22335,13 @@ configure-stagefeedback-intl:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
 	cd $(HOST_SUBDIR)/intl || exit 1; \
@@ -23277,7 +22356,7 @@ configure-stagefeedback-intl:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
 
@@ -23315,13 +22394,18 @@ all-stage1-intl: configure-stage1-intl
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-intl)
 
 maybe-clean-stage1-intl: clean-stage1-intl
@@ -23351,14 +22435,19 @@ all-stage2-intl: configure-stage2-intl
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-intl)
 
 maybe-clean-stage2-intl: clean-stage2-intl
@@ -23377,44 +22466,6 @@ clean-stage2-intl:
 @endif intl-bootstrap
 
 
-.PHONY: all-stageb2g0-intl maybe-all-stageb2g0-intl
-.PHONY: clean-stageb2g0-intl maybe-clean-stageb2g0-intl
-maybe-all-stageb2g0-intl:
-maybe-clean-stageb2g0-intl:
-@if intl-bootstrap
-maybe-all-stageb2g0-intl: all-stageb2g0-intl
-all-stageb2g0: all-stageb2g0-intl
-TARGET-stageb2g0-intl = $(TARGET-intl)
-all-stageb2g0-intl: configure-stageb2g0-intl
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-intl
-clean-stageb2g0-intl:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-intl/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif intl-bootstrap
-
-
 .PHONY: all-stage3-intl maybe-all-stage3-intl
 .PHONY: clean-stage3-intl maybe-clean-stage3-intl
 maybe-all-stage3-intl:
@@ -23427,14 +22478,19 @@ all-stage3-intl: configure-stage3-intl
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-intl)
 
 maybe-clean-stage3-intl: clean-stage3-intl
@@ -23453,44 +22509,6 @@ clean-stage3-intl:
 @endif intl-bootstrap
 
 
-.PHONY: all-stageb3g2-intl maybe-all-stageb3g2-intl
-.PHONY: clean-stageb3g2-intl maybe-clean-stageb3g2-intl
-maybe-all-stageb3g2-intl:
-maybe-clean-stageb3g2-intl:
-@if intl-bootstrap
-maybe-all-stageb3g2-intl: all-stageb3g2-intl
-all-stageb3g2: all-stageb3g2-intl
-TARGET-stageb3g2-intl = $(TARGET-intl)
-all-stageb3g2-intl: configure-stageb3g2-intl
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-intl
-clean-stageb3g2-intl:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-intl/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif intl-bootstrap
-
-
 .PHONY: all-stage4-intl maybe-all-stage4-intl
 .PHONY: clean-stage4-intl maybe-clean-stage4-intl
 maybe-all-stage4-intl:
@@ -23503,14 +22521,19 @@ all-stage4-intl: configure-stage4-intl
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-intl)
 
 maybe-clean-stage4-intl: clean-stage4-intl
@@ -23541,14 +22564,19 @@ all-stageprofile-intl: configure-stageprofile-intl
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-intl)
 
 maybe-clean-stageprofile-intl: clean-stageprofile-intl
@@ -23579,14 +22607,19 @@ all-stagefeedback-intl: configure-stagefeedback-intl
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-intl)
 
 maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
@@ -24840,10 +23873,12 @@ configure-stage1-ld:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
 	cd $(HOST_SUBDIR)/ld || exit 1; \
@@ -24857,8 +23892,7 @@ configure-stage1-ld:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
 .PHONY: configure-stage2-ld maybe-configure-stage2-ld
@@ -24870,11 +23904,13 @@ configure-stage2-ld:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
 	cd $(HOST_SUBDIR)/ld || exit 1; \
@@ -24889,38 +23925,7 @@ configure-stage2-ld:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stageb2g0-ld maybe-configure-stageb2g0-ld
-maybe-configure-stageb2g0-ld:
-@if ld-bootstrap
-maybe-configure-stageb2g0-ld: configure-stageb2g0-ld
-configure-stageb2g0-ld:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
 .PHONY: configure-stage3-ld maybe-configure-stage3-ld
@@ -24932,11 +23937,13 @@ configure-stage3-ld:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
 	cd $(HOST_SUBDIR)/ld || exit 1; \
@@ -24951,38 +23958,7 @@ configure-stage3-ld:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stageb3g2-ld maybe-configure-stageb3g2-ld
-maybe-configure-stageb3g2-ld:
-@if ld-bootstrap
-maybe-configure-stageb3g2-ld: configure-stageb3g2-ld
-configure-stageb3g2-ld:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
 .PHONY: configure-stage4-ld maybe-configure-stage4-ld
@@ -24994,11 +23970,13 @@ configure-stage4-ld:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
 	cd $(HOST_SUBDIR)/ld || exit 1; \
@@ -25013,7 +23991,7 @@ configure-stage4-ld:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
 .PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
@@ -25025,11 +24003,13 @@ configure-stageprofile-ld:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
 	cd $(HOST_SUBDIR)/ld || exit 1; \
@@ -25044,7 +24024,7 @@ configure-stageprofile-ld:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
 .PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
@@ -25056,11 +24036,13 @@ configure-stagefeedback-ld:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
 	cd $(HOST_SUBDIR)/ld || exit 1; \
@@ -25075,7 +24057,7 @@ configure-stagefeedback-ld:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
 
@@ -25113,13 +24095,18 @@ all-stage1-ld: configure-stage1-ld
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-ld)
 
 maybe-clean-stage1-ld: clean-stage1-ld
@@ -25149,14 +24136,19 @@ all-stage2-ld: configure-stage2-ld
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-ld)
 
 maybe-clean-stage2-ld: clean-stage2-ld
@@ -25175,44 +24167,6 @@ clean-stage2-ld:
 @endif ld-bootstrap
 
 
-.PHONY: all-stageb2g0-ld maybe-all-stageb2g0-ld
-.PHONY: clean-stageb2g0-ld maybe-clean-stageb2g0-ld
-maybe-all-stageb2g0-ld:
-maybe-clean-stageb2g0-ld:
-@if ld-bootstrap
-maybe-all-stageb2g0-ld: all-stageb2g0-ld
-all-stageb2g0: all-stageb2g0-ld
-TARGET-stageb2g0-ld = $(TARGET-ld)
-all-stageb2g0-ld: configure-stageb2g0-ld
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-ld
-clean-stageb2g0-ld:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-ld/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif ld-bootstrap
-
-
 .PHONY: all-stage3-ld maybe-all-stage3-ld
 .PHONY: clean-stage3-ld maybe-clean-stage3-ld
 maybe-all-stage3-ld:
@@ -25225,14 +24179,19 @@ all-stage3-ld: configure-stage3-ld
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-ld)
 
 maybe-clean-stage3-ld: clean-stage3-ld
@@ -25251,44 +24210,6 @@ clean-stage3-ld:
 @endif ld-bootstrap
 
 
-.PHONY: all-stageb3g2-ld maybe-all-stageb3g2-ld
-.PHONY: clean-stageb3g2-ld maybe-clean-stageb3g2-ld
-maybe-all-stageb3g2-ld:
-maybe-clean-stageb3g2-ld:
-@if ld-bootstrap
-maybe-all-stageb3g2-ld: all-stageb3g2-ld
-all-stageb3g2: all-stageb3g2-ld
-TARGET-stageb3g2-ld = $(TARGET-ld)
-all-stageb3g2-ld: configure-stageb3g2-ld
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-ld
-clean-stageb3g2-ld:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-ld/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif ld-bootstrap
-
-
 .PHONY: all-stage4-ld maybe-all-stage4-ld
 .PHONY: clean-stage4-ld maybe-clean-stage4-ld
 maybe-all-stage4-ld:
@@ -25301,14 +24222,19 @@ all-stage4-ld: configure-stage4-ld
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-ld)
 
 maybe-clean-stage4-ld: clean-stage4-ld
@@ -25339,14 +24265,19 @@ all-stageprofile-ld: configure-stageprofile-ld
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-ld)
 
 maybe-clean-stageprofile-ld: clean-stageprofile-ld
@@ -25377,14 +24308,19 @@ all-stagefeedback-ld: configure-stagefeedback-ld
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-ld)
 
 maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
@@ -25803,10 +24739,12 @@ configure-stage1-libcpp:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
@@ -25820,8 +24758,7 @@ configure-stage1-libcpp:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
 .PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
@@ -25833,11 +24770,13 @@ configure-stage2-libcpp:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
@@ -25852,38 +24791,7 @@ configure-stage2-libcpp:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stageb2g0-libcpp maybe-configure-stageb2g0-libcpp
-maybe-configure-stageb2g0-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stageb2g0-libcpp: configure-stageb2g0-libcpp
-configure-stageb2g0-libcpp:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
 .PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
@@ -25895,11 +24803,13 @@ configure-stage3-libcpp:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
@@ -25914,38 +24824,7 @@ configure-stage3-libcpp:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stageb3g2-libcpp maybe-configure-stageb3g2-libcpp
-maybe-configure-stageb3g2-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stageb3g2-libcpp: configure-stageb3g2-libcpp
-configure-stageb3g2-libcpp:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
 .PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
@@ -25957,11 +24836,13 @@ configure-stage4-libcpp:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
@@ -25976,7 +24857,7 @@ configure-stage4-libcpp:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
 .PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
@@ -25988,11 +24869,13 @@ configure-stageprofile-libcpp:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
@@ -26007,7 +24890,7 @@ configure-stageprofile-libcpp:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
 .PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
@@ -26019,11 +24902,13 @@ configure-stagefeedback-libcpp:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
@@ -26038,7 +24923,7 @@ configure-stagefeedback-libcpp:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
 
@@ -26076,13 +24961,18 @@ all-stage1-libcpp: configure-stage1-libcpp
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-libcpp)
 
 maybe-clean-stage1-libcpp: clean-stage1-libcpp
@@ -26112,14 +25002,19 @@ all-stage2-libcpp: configure-stage2-libcpp
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-libcpp)
 
 maybe-clean-stage2-libcpp: clean-stage2-libcpp
@@ -26138,44 +25033,6 @@ clean-stage2-libcpp:
 @endif libcpp-bootstrap
 
 
-.PHONY: all-stageb2g0-libcpp maybe-all-stageb2g0-libcpp
-.PHONY: clean-stageb2g0-libcpp maybe-clean-stageb2g0-libcpp
-maybe-all-stageb2g0-libcpp:
-maybe-clean-stageb2g0-libcpp:
-@if libcpp-bootstrap
-maybe-all-stageb2g0-libcpp: all-stageb2g0-libcpp
-all-stageb2g0: all-stageb2g0-libcpp
-TARGET-stageb2g0-libcpp = $(TARGET-libcpp)
-all-stageb2g0-libcpp: configure-stageb2g0-libcpp
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-libcpp
-clean-stageb2g0-libcpp:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-libcpp/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif libcpp-bootstrap
-
-
 .PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
 .PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
 maybe-all-stage3-libcpp:
@@ -26188,14 +25045,19 @@ all-stage3-libcpp: configure-stage3-libcpp
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-libcpp)
 
 maybe-clean-stage3-libcpp: clean-stage3-libcpp
@@ -26214,44 +25076,6 @@ clean-stage3-libcpp:
 @endif libcpp-bootstrap
 
 
-.PHONY: all-stageb3g2-libcpp maybe-all-stageb3g2-libcpp
-.PHONY: clean-stageb3g2-libcpp maybe-clean-stageb3g2-libcpp
-maybe-all-stageb3g2-libcpp:
-maybe-clean-stageb3g2-libcpp:
-@if libcpp-bootstrap
-maybe-all-stageb3g2-libcpp: all-stageb3g2-libcpp
-all-stageb3g2: all-stageb3g2-libcpp
-TARGET-stageb3g2-libcpp = $(TARGET-libcpp)
-all-stageb3g2-libcpp: configure-stageb3g2-libcpp
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-libcpp
-clean-stageb3g2-libcpp:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-libcpp/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif libcpp-bootstrap
-
-
 .PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
 .PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
 maybe-all-stage4-libcpp:
@@ -26264,14 +25088,19 @@ all-stage4-libcpp: configure-stage4-libcpp
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-libcpp)
 
 maybe-clean-stage4-libcpp: clean-stage4-libcpp
@@ -26302,14 +25131,19 @@ all-stageprofile-libcpp: configure-stageprofile-libcpp
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-libcpp)
 
 maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
@@ -26340,14 +25174,19 @@ all-stagefeedback-libcpp: configure-stagefeedback-libcpp
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-libcpp)
 
 maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
@@ -26766,10 +25605,12 @@ configure-stage1-libdecnumber:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
@@ -26783,8 +25624,7 @@ configure-stage1-libdecnumber:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
 .PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber
@@ -26796,11 +25636,13 @@ configure-stage2-libdecnumber:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
@@ -26815,38 +25657,7 @@ configure-stage2-libdecnumber:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stageb2g0-libdecnumber maybe-configure-stageb2g0-libdecnumber
-maybe-configure-stageb2g0-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stageb2g0-libdecnumber: configure-stageb2g0-libdecnumber
-configure-stageb2g0-libdecnumber:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
 .PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber
@@ -26858,11 +25669,13 @@ configure-stage3-libdecnumber:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
@@ -26877,38 +25690,7 @@ configure-stage3-libdecnumber:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stageb3g2-libdecnumber maybe-configure-stageb3g2-libdecnumber
-maybe-configure-stageb3g2-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stageb3g2-libdecnumber: configure-stageb3g2-libdecnumber
-configure-stageb3g2-libdecnumber:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
 .PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber
@@ -26920,11 +25702,13 @@ configure-stage4-libdecnumber:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
@@ -26939,7 +25723,7 @@ configure-stage4-libdecnumber:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
 .PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber
@@ -26951,11 +25735,13 @@ configure-stageprofile-libdecnumber:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
@@ -26970,7 +25756,7 @@ configure-stageprofile-libdecnumber:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
 .PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber
@@ -26982,11 +25768,13 @@ configure-stagefeedback-libdecnumber:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
@@ -27001,7 +25789,7 @@ configure-stagefeedback-libdecnumber:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
 
@@ -27039,13 +25827,18 @@ all-stage1-libdecnumber: configure-stage1-libdecnumber
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-libdecnumber)
 
 maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
@@ -27075,14 +25868,19 @@ all-stage2-libdecnumber: configure-stage2-libdecnumber
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-libdecnumber)
 
 maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
@@ -27101,44 +25899,6 @@ clean-stage2-libdecnumber:
 @endif libdecnumber-bootstrap
 
 
-.PHONY: all-stageb2g0-libdecnumber maybe-all-stageb2g0-libdecnumber
-.PHONY: clean-stageb2g0-libdecnumber maybe-clean-stageb2g0-libdecnumber
-maybe-all-stageb2g0-libdecnumber:
-maybe-clean-stageb2g0-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stageb2g0-libdecnumber: all-stageb2g0-libdecnumber
-all-stageb2g0: all-stageb2g0-libdecnumber
-TARGET-stageb2g0-libdecnumber = $(TARGET-libdecnumber)
-all-stageb2g0-libdecnumber: configure-stageb2g0-libdecnumber
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-libdecnumber
-clean-stageb2g0-libdecnumber:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-libdecnumber/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif libdecnumber-bootstrap
-
-
 .PHONY: all-stage3-libdecnumber maybe-all-stage3-libdecnumber
 .PHONY: clean-stage3-libdecnumber maybe-clean-stage3-libdecnumber
 maybe-all-stage3-libdecnumber:
@@ -27151,14 +25911,19 @@ all-stage3-libdecnumber: configure-stage3-libdecnumber
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-libdecnumber)
 
 maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
@@ -27177,44 +25942,6 @@ clean-stage3-libdecnumber:
 @endif libdecnumber-bootstrap
 
 
-.PHONY: all-stageb3g2-libdecnumber maybe-all-stageb3g2-libdecnumber
-.PHONY: clean-stageb3g2-libdecnumber maybe-clean-stageb3g2-libdecnumber
-maybe-all-stageb3g2-libdecnumber:
-maybe-clean-stageb3g2-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stageb3g2-libdecnumber: all-stageb3g2-libdecnumber
-all-stageb3g2: all-stageb3g2-libdecnumber
-TARGET-stageb3g2-libdecnumber = $(TARGET-libdecnumber)
-all-stageb3g2-libdecnumber: configure-stageb3g2-libdecnumber
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-libdecnumber
-clean-stageb3g2-libdecnumber:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-libdecnumber/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif libdecnumber-bootstrap
-
-
 .PHONY: all-stage4-libdecnumber maybe-all-stage4-libdecnumber
 .PHONY: clean-stage4-libdecnumber maybe-clean-stage4-libdecnumber
 maybe-all-stage4-libdecnumber:
@@ -27227,14 +25954,19 @@ all-stage4-libdecnumber: configure-stage4-libdecnumber
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-libdecnumber)
 
 maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
@@ -27265,14 +25997,19 @@ all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-libdecnumber)
 
 maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
@@ -27303,14 +26040,19 @@ all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-libdecnumber)
 
 maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
@@ -28154,10 +26896,12 @@ configure-stage1-libiberty:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
@@ -28171,8 +26915,7 @@ configure-stage1-libiberty:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif libiberty-bootstrap
 
 .PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
@@ -28184,11 +26927,13 @@ configure-stage2-libiberty:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
@@ -28203,38 +26948,7 @@ configure-stage2-libiberty:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stageb2g0-libiberty maybe-configure-stageb2g0-libiberty
-maybe-configure-stageb2g0-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stageb2g0-libiberty: configure-stageb2g0-libiberty
-configure-stageb2g0-libiberty:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif libiberty-bootstrap
 
 .PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
@@ -28246,11 +26960,13 @@ configure-stage3-libiberty:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
@@ -28265,38 +26981,7 @@ configure-stage3-libiberty:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stageb3g2-libiberty maybe-configure-stageb3g2-libiberty
-maybe-configure-stageb3g2-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stageb3g2-libiberty: configure-stageb3g2-libiberty
-configure-stageb3g2-libiberty:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif libiberty-bootstrap
 
 .PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
@@ -28308,11 +26993,13 @@ configure-stage4-libiberty:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
@@ -28327,7 +27014,7 @@ configure-stage4-libiberty:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif libiberty-bootstrap
 
 .PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
@@ -28339,11 +27026,13 @@ configure-stageprofile-libiberty:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
@@ -28358,7 +27047,7 @@ configure-stageprofile-libiberty:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif libiberty-bootstrap
 
 .PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
@@ -28370,11 +27059,13 @@ configure-stagefeedback-libiberty:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
@@ -28389,7 +27080,7 @@ configure-stagefeedback-libiberty:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif libiberty-bootstrap
 
 
@@ -28427,13 +27118,18 @@ all-stage1-libiberty: configure-stage1-libiberty
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-libiberty)
 
 maybe-clean-stage1-libiberty: clean-stage1-libiberty
@@ -28463,14 +27159,19 @@ all-stage2-libiberty: configure-stage2-libiberty
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-libiberty)
 
 maybe-clean-stage2-libiberty: clean-stage2-libiberty
@@ -28489,44 +27190,6 @@ clean-stage2-libiberty:
 @endif libiberty-bootstrap
 
 
-.PHONY: all-stageb2g0-libiberty maybe-all-stageb2g0-libiberty
-.PHONY: clean-stageb2g0-libiberty maybe-clean-stageb2g0-libiberty
-maybe-all-stageb2g0-libiberty:
-maybe-clean-stageb2g0-libiberty:
-@if libiberty-bootstrap
-maybe-all-stageb2g0-libiberty: all-stageb2g0-libiberty
-all-stageb2g0: all-stageb2g0-libiberty
-TARGET-stageb2g0-libiberty = $(TARGET-libiberty)
-all-stageb2g0-libiberty: configure-stageb2g0-libiberty
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-libiberty
-clean-stageb2g0-libiberty:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-libiberty/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif libiberty-bootstrap
-
-
 .PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
 .PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
 maybe-all-stage3-libiberty:
@@ -28539,14 +27202,19 @@ all-stage3-libiberty: configure-stage3-libiberty
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-libiberty)
 
 maybe-clean-stage3-libiberty: clean-stage3-libiberty
@@ -28565,44 +27233,6 @@ clean-stage3-libiberty:
 @endif libiberty-bootstrap
 
 
-.PHONY: all-stageb3g2-libiberty maybe-all-stageb3g2-libiberty
-.PHONY: clean-stageb3g2-libiberty maybe-clean-stageb3g2-libiberty
-maybe-all-stageb3g2-libiberty:
-maybe-clean-stageb3g2-libiberty:
-@if libiberty-bootstrap
-maybe-all-stageb3g2-libiberty: all-stageb3g2-libiberty
-all-stageb3g2: all-stageb3g2-libiberty
-TARGET-stageb3g2-libiberty = $(TARGET-libiberty)
-all-stageb3g2-libiberty: configure-stageb3g2-libiberty
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-libiberty
-clean-stageb3g2-libiberty:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-libiberty/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif libiberty-bootstrap
-
-
 .PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
 .PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
 maybe-all-stage4-libiberty:
@@ -28615,14 +27245,19 @@ all-stage4-libiberty: configure-stage4-libiberty
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-libiberty)
 
 maybe-clean-stage4-libiberty: clean-stage4-libiberty
@@ -28653,14 +27288,19 @@ all-stageprofile-libiberty: configure-stageprofile-libiberty
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-libiberty)
 
 maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
@@ -28691,14 +27331,19 @@ all-stagefeedback-libiberty: configure-stagefeedback-libiberty
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-libiberty)
 
 maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
@@ -39239,10 +37884,12 @@ configure-stage1-zlib:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS)  \
+	$(HOST_EXPORTS) \
 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
 	cd $(HOST_SUBDIR)/zlib || exit 1; \
@@ -39256,8 +37903,7 @@ configure-stage1-zlib:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
 .PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
@@ -39269,11 +37915,13 @@ configure-stage2-zlib:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
 	cd $(HOST_SUBDIR)/zlib || exit 1; \
@@ -39288,38 +37936,7 @@ configure-stage2-zlib:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stageb2g0-zlib maybe-configure-stageb2g0-zlib
-maybe-configure-stageb2g0-zlib:
-@if zlib-bootstrap
-maybe-configure-stageb2g0-zlib: configure-stageb2g0-zlib
-configure-stageb2g0-zlib:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
 .PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
@@ -39331,11 +37948,13 @@ configure-stage3-zlib:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
 	cd $(HOST_SUBDIR)/zlib || exit 1; \
@@ -39350,38 +37969,7 @@ configure-stage3-zlib:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stageb3g2-zlib maybe-configure-stageb3g2-zlib
-maybe-configure-stageb3g2-zlib:
-@if zlib-bootstrap
-maybe-configure-stageb3g2-zlib: configure-stageb3g2-zlib
-configure-stageb3g2-zlib:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
 .PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
@@ -39393,11 +37981,13 @@ configure-stage4-zlib:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
 	cd $(HOST_SUBDIR)/zlib || exit 1; \
@@ -39412,7 +38002,7 @@ configure-stage4-zlib:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
 .PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
@@ -39424,11 +38014,13 @@ configure-stageprofile-zlib:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
 	cd $(HOST_SUBDIR)/zlib || exit 1; \
@@ -39443,7 +38035,7 @@ configure-stageprofile-zlib:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
 .PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
@@ -39455,11 +38047,13 @@ configure-stagefeedback-zlib:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
 	cd $(HOST_SUBDIR)/zlib || exit 1; \
@@ -39474,7 +38068,7 @@ configure-stagefeedback-zlib:
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
 
@@ -39512,13 +38106,18 @@ all-stage1-zlib: configure-stage1-zlib
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(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)   \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-zlib)
 
 maybe-clean-stage1-zlib: clean-stage1-zlib
@@ -39548,14 +38147,19 @@ all-stage2-zlib: configure-stage2-zlib
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(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)  \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-zlib)
 
 maybe-clean-stage2-zlib: clean-stage2-zlib
@@ -39574,44 +38178,6 @@ clean-stage2-zlib:
 @endif zlib-bootstrap
 
 
-.PHONY: all-stageb2g0-zlib maybe-all-stageb2g0-zlib
-.PHONY: clean-stageb2g0-zlib maybe-clean-stageb2g0-zlib
-maybe-all-stageb2g0-zlib:
-maybe-clean-stageb2g0-zlib:
-@if zlib-bootstrap
-maybe-all-stageb2g0-zlib: all-stageb2g0-zlib
-all-stageb2g0: all-stageb2g0-zlib
-TARGET-stageb2g0-zlib = $(TARGET-zlib)
-all-stageb2g0-zlib: configure-stageb2g0-zlib
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-zlib
-clean-stageb2g0-zlib:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb2g0-zlib/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif zlib-bootstrap
-
-
 .PHONY: all-stage3-zlib maybe-all-stage3-zlib
 .PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
 maybe-all-stage3-zlib:
@@ -39624,14 +38190,19 @@ all-stage3-zlib: configure-stage3-zlib
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(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)  \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-zlib)
 
 maybe-clean-stage3-zlib: clean-stage3-zlib
@@ -39650,44 +38221,6 @@ clean-stage3-zlib:
 @endif zlib-bootstrap
 
 
-.PHONY: all-stageb3g2-zlib maybe-all-stageb3g2-zlib
-.PHONY: clean-stageb3g2-zlib maybe-clean-stageb3g2-zlib
-maybe-all-stageb3g2-zlib:
-maybe-clean-stageb3g2-zlib:
-@if zlib-bootstrap
-maybe-all-stageb3g2-zlib: all-stageb3g2-zlib
-all-stageb3g2: all-stageb3g2-zlib
-TARGET-stageb3g2-zlib = $(TARGET-zlib)
-all-stageb3g2-zlib: configure-stageb3g2-zlib
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-zlib
-clean-stageb3g2-zlib:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageb3g2-zlib/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif zlib-bootstrap
-
-
 .PHONY: all-stage4-zlib maybe-all-stage4-zlib
 .PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
 maybe-all-stage4-zlib:
@@ -39700,14 +38233,19 @@ all-stage4-zlib: configure-stage4-zlib
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+		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)  \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-zlib)
 
 maybe-clean-stage4-zlib: clean-stage4-zlib
@@ -39738,14 +38276,19 @@ all-stageprofile-zlib: configure-stageprofile-zlib
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-zlib)
 
 maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
@@ -39776,14 +38319,19 @@ all-stagefeedback-zlib: configure-stagefeedback-zlib
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(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)  \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-zlib)
 
 maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
@@ -44882,6 +43430,7 @@ configure-stage1-target-libgcc:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	echo "Checking multilib configuration for libgcc..."; \
 	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
 	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
@@ -44895,9 +43444,10 @@ configure-stage1-target-libgcc:
 	  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_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;  \
+	$(NORMAL_TARGET_EXPORTS) \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \
 	echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
@@ -44911,8 +43461,7 @@ configure-stage1-target-libgcc:
 	$(SHELL) $${libsrcdir}/configure \
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 	  --target=${target_alias} $${srcdiroption} \
-	   \
-	  --disable-intermodule $(STAGE1_CHECKING) 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+	  $(STAGE1_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
 .PHONY: configure-stage2-target-libgcc maybe-configure-stage2-target-libgcc
@@ -44924,6 +43473,7 @@ configure-stage2-target-libgcc:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	echo "Checking multilib configuration for libgcc..."; \
 	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
 	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
@@ -44938,9 +43488,10 @@ configure-stage2-target-libgcc:
 	fi; \
 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
 	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	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;  \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \
 	echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
@@ -44955,50 +43506,7 @@ configure-stage2-target-libgcc:
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif target-libgcc-bootstrap
-
-.PHONY: configure-stageb2g0-target-libgcc maybe-configure-stageb2g0-target-libgcc
-maybe-configure-stageb2g0-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stageb2g0-target-libgcc: configure-stageb2g0-target-libgcc
-configure-stageb2g0-target-libgcc:
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libgcc..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libgcc"; \
-	libsrcdir="$$s/libgcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE2_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
 .PHONY: configure-stage3-target-libgcc maybe-configure-stage3-target-libgcc
@@ -45010,6 +43518,7 @@ configure-stage3-target-libgcc:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	echo "Checking multilib configuration for libgcc..."; \
 	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
 	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
@@ -45024,9 +43533,10 @@ configure-stage3-target-libgcc:
 	fi; \
 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
 	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	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;  \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \
 	echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
@@ -45041,50 +43551,7 @@ configure-stage3-target-libgcc:
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
-@endif target-libgcc-bootstrap
-
-.PHONY: configure-stageb3g2-target-libgcc maybe-configure-stageb3g2-target-libgcc
-maybe-configure-stageb3g2-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stageb3g2-target-libgcc: configure-stageb3g2-target-libgcc
-configure-stageb3g2-target-libgcc:
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libgcc..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	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; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libgcc"; \
-	libsrcdir="$$s/libgcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE3_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
 .PHONY: configure-stage4-target-libgcc maybe-configure-stage4-target-libgcc
@@ -45096,6 +43563,7 @@ configure-stage4-target-libgcc:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	echo "Checking multilib configuration for libgcc..."; \
 	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
 	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
@@ -45110,9 +43578,10 @@ configure-stage4-target-libgcc:
 	fi; \
 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
 	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	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;  \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \
 	echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
@@ -45127,7 +43596,7 @@ configure-stage4-target-libgcc:
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGE4_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
 .PHONY: configure-stageprofile-target-libgcc maybe-configure-stageprofile-target-libgcc
@@ -45139,6 +43608,7 @@ configure-stageprofile-target-libgcc:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	echo "Checking multilib configuration for libgcc..."; \
 	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
 	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
@@ -45153,9 +43623,10 @@ configure-stageprofile-target-libgcc:
 	fi; \
 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
 	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	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;  \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \
 	echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
@@ -45170,7 +43641,7 @@ configure-stageprofile-target-libgcc:
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
 .PHONY: configure-stagefeedback-target-libgcc maybe-configure-stagefeedback-target-libgcc
@@ -45182,6 +43653,7 @@ configure-stagefeedback-target-libgcc:
 	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	echo "Checking multilib configuration for libgcc..."; \
 	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
 	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
@@ -45196,9 +43668,10 @@ configure-stagefeedback-target-libgcc:
 	fi; \
 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
 	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	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;  \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \
 	echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
@@ -45213,7 +43686,7 @@ configure-stagefeedback-target-libgcc:
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 	  --target=${target_alias} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  @stage2_werror_flag@ 
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
 
@@ -45251,13 +43724,18 @@ all-stage1-target-libgcc: configure-stage1-target-libgcc
 	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
 	$(NORMAL_TARGET_EXPORTS) \
 	cd $(TARGET_SUBDIR)/libgcc && \
 	$(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)   \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
 		$(TARGET-stage1-target-libgcc)
 
 maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
@@ -45287,14 +43765,19 @@ all-stage2-target-libgcc: configure-stage2-target-libgcc
 	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(NORMAL_TARGET_EXPORTS) \
 	 \
 	cd $(TARGET_SUBDIR)/libgcc && \
 	$(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)   \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGE2_TFLAGS)" \
 		$(TARGET-stage2-target-libgcc)
 
 maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
@@ -45313,44 +43796,6 @@ clean-stage2-target-libgcc:
 @endif target-libgcc-bootstrap
 
 
-.PHONY: all-stageb2g0-target-libgcc maybe-all-stageb2g0-target-libgcc
-.PHONY: clean-stageb2g0-target-libgcc maybe-clean-stageb2g0-target-libgcc
-maybe-all-stageb2g0-target-libgcc:
-maybe-clean-stageb2g0-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stageb2g0-target-libgcc: all-stageb2g0-target-libgcc
-all-stageb2g0: all-stageb2g0-target-libgcc
-TARGET-stageb2g0-target-libgcc = $(TARGET-target-libgcc)
-all-stageb2g0-target-libgcc: configure-stageb2g0-target-libgcc
-	@[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	 \
-	cd $(TARGET_SUBDIR)/libgcc && \
-	$(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
-clean-stageb2g0: clean-stageb2g0-target-libgcc
-clean-stageb2g0-target-libgcc:
-	@if [ $(current_stage) = stageb2g0 ]; then \
-	  [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageb2g0-libgcc/Makefile ] || exit 0; \
-	  $(MAKE) stageb2g0-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libgcc && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
-		  \
-		 clean
-@endif target-libgcc-bootstrap
-
-
 .PHONY: all-stage3-target-libgcc maybe-all-stage3-target-libgcc
 .PHONY: clean-stage3-target-libgcc maybe-clean-stage3-target-libgcc
 maybe-all-stage3-target-libgcc:
@@ -45363,14 +43808,19 @@ all-stage3-target-libgcc: configure-stage3-target-libgcc
 	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(NORMAL_TARGET_EXPORTS) \
 	 \
 	cd $(TARGET_SUBDIR)/libgcc && \
 	$(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)   \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGE3_TFLAGS)" \
 		$(TARGET-stage3-target-libgcc)
 
 maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
@@ -45389,44 +43839,6 @@ clean-stage3-target-libgcc:
 @endif target-libgcc-bootstrap
 
 
-.PHONY: all-stageb3g2-target-libgcc maybe-all-stageb3g2-target-libgcc
-.PHONY: clean-stageb3g2-target-libgcc maybe-clean-stageb3g2-target-libgcc
-maybe-all-stageb3g2-target-libgcc:
-maybe-clean-stageb3g2-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stageb3g2-target-libgcc: all-stageb3g2-target-libgcc
-all-stageb3g2: all-stageb3g2-target-libgcc
-TARGET-stageb3g2-target-libgcc = $(TARGET-target-libgcc)
-all-stageb3g2-target-libgcc: configure-stageb3g2-target-libgcc
-	@[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	 \
-	cd $(TARGET_SUBDIR)/libgcc && \
-	$(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
-clean-stageb3g2: clean-stageb3g2-target-libgcc
-clean-stageb3g2-target-libgcc:
-	@if [ $(current_stage) = stageb3g2 ]; then \
-	  [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageb3g2-libgcc/Makefile ] || exit 0; \
-	  $(MAKE) stageb3g2-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libgcc && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
-		  \
-		 clean
-@endif target-libgcc-bootstrap
-
-
 .PHONY: all-stage4-target-libgcc maybe-all-stage4-target-libgcc
 .PHONY: clean-stage4-target-libgcc maybe-clean-stage4-target-libgcc
 maybe-all-stage4-target-libgcc:
@@ -45439,14 +43851,19 @@ all-stage4-target-libgcc: configure-stage4-target-libgcc
 	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(NORMAL_TARGET_EXPORTS) \
 	 \
 	cd $(TARGET_SUBDIR)/libgcc && \
 	$(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)   \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGE4_TFLAGS)" \
 		$(TARGET-stage4-target-libgcc)
 
 maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
@@ -45477,14 +43894,19 @@ all-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
 	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
 	$(NORMAL_TARGET_EXPORTS) \
 	 \
 	cd $(TARGET_SUBDIR)/libgcc && \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS)   \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
 		$(TARGET-stageprofile-target-libgcc)
 
 maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
@@ -45515,14 +43937,19 @@ all-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
 	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(NORMAL_TARGET_EXPORTS) \
 	 \
 	cd $(TARGET_SUBDIR)/libgcc && \
 	$(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)   \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
 		$(TARGET-stagefeedback-target-libgcc)
 
 maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
@@ -53509,6 +51936,7 @@ bootstrap2:
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 bootstrap2-lean:
@@ -53519,6 +51947,7 @@ bootstrap2-lean:
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 
@@ -53534,274 +51963,6 @@ distclean-stage2::
 @endif gcc-bootstrap
 
 
-.PHONY: stageb2g0-start stageb2g0-end
-
-stageb2g0-start::
-	@: $(MAKE); $(stage); \
-	echo stageb2g0 > stage_current ; \
-	echo stageb2g0 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-bfd ] || \
-	  mkdir stageb2g0-bfd; \
-	mv stageb2g0-bfd bfd  ; \
-	mv stage1-bfd prev-bfd || test -f stage1-lean 
-@endif bfd
-@if opcodes
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-opcodes ] || \
-	  mkdir stageb2g0-opcodes; \
-	mv stageb2g0-opcodes opcodes  ; \
-	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
-@endif opcodes
-@if binutils
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-binutils ] || \
-	  mkdir stageb2g0-binutils; \
-	mv stageb2g0-binutils binutils  ; \
-	mv stage1-binutils prev-binutils || test -f stage1-lean 
-@endif binutils
-@if gas
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-gas ] || \
-	  mkdir stageb2g0-gas; \
-	mv stageb2g0-gas gas  ; \
-	mv stage1-gas prev-gas || test -f stage1-lean 
-@endif gas
-@if gcc
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-gcc ] || \
-	  mkdir stageb2g0-gcc; \
-	mv stageb2g0-gcc gcc  ; \
-	mv stage1-gcc prev-gcc || test -f stage1-lean 
-@endif gcc
-@if gmp
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-gmp ] || \
-	  mkdir stageb2g0-gmp; \
-	mv stageb2g0-gmp gmp  ; \
-	mv stage1-gmp prev-gmp || test -f stage1-lean 
-@endif gmp
-@if mpfr
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-mpfr ] || \
-	  mkdir stageb2g0-mpfr; \
-	mv stageb2g0-mpfr mpfr  ; \
-	mv stage1-mpfr prev-mpfr || test -f stage1-lean 
-@endif mpfr
-@if ppl
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-ppl ] || \
-	  mkdir stageb2g0-ppl; \
-	mv stageb2g0-ppl ppl  ; \
-	mv stage1-ppl prev-ppl || test -f stage1-lean 
-@endif ppl
-@if cloog
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-cloog ] || \
-	  mkdir stageb2g0-cloog; \
-	mv stageb2g0-cloog cloog  ; \
-	mv stage1-cloog prev-cloog || test -f stage1-lean 
-@endif cloog
-@if gold
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-gold ] || \
-	  mkdir stageb2g0-gold; \
-	mv stageb2g0-gold gold  ; \
-	mv stage1-gold prev-gold || test -f stage1-lean 
-@endif gold
-@if intl
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-intl ] || \
-	  mkdir stageb2g0-intl; \
-	mv stageb2g0-intl intl  ; \
-	mv stage1-intl prev-intl || test -f stage1-lean 
-@endif intl
-@if ld
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-ld ] || \
-	  mkdir stageb2g0-ld; \
-	mv stageb2g0-ld ld  ; \
-	mv stage1-ld prev-ld || test -f stage1-lean 
-@endif ld
-@if libcpp
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-libcpp ] || \
-	  mkdir stageb2g0-libcpp; \
-	mv stageb2g0-libcpp libcpp  ; \
-	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
-@endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-libdecnumber ] || \
-	  mkdir stageb2g0-libdecnumber; \
-	mv stageb2g0-libdecnumber libdecnumber  ; \
-	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
-@endif libdecnumber
-@if libiberty
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-libiberty ] || \
-	  mkdir stageb2g0-libiberty; \
-	mv stageb2g0-libiberty libiberty  ; \
-	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
-@endif libiberty
-@if zlib
-	@cd $(HOST_SUBDIR); [ -d stageb2g0-zlib ] || \
-	  mkdir stageb2g0-zlib; \
-	mv stageb2g0-zlib zlib  ; \
-	mv stage1-zlib prev-zlib || test -f stage1-lean 
-@endif zlib
-	@[ -d stageb2g0-$(TARGET_SUBDIR) ] || \
-	  mkdir stageb2g0-$(TARGET_SUBDIR); \
-	mv stageb2g0-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
-
-stageb2g0-end:: 
-@if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stageb2g0-bfd ; \
-	  mv prev-bfd stage1-bfd ; :  ; \
-	fi
-@endif bfd
-@if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stageb2g0-opcodes ; \
-	  mv prev-opcodes stage1-opcodes ; :  ; \
-	fi
-@endif opcodes
-@if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stageb2g0-binutils ; \
-	  mv prev-binutils stage1-binutils ; :  ; \
-	fi
-@endif binutils
-@if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stageb2g0-gas ; \
-	  mv prev-gas stage1-gas ; :  ; \
-	fi
-@endif gas
-@if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stageb2g0-gcc ; \
-	  mv prev-gcc stage1-gcc ; :  ; \
-	fi
-@endif gcc
-@if gmp
-	@if test -d $(HOST_SUBDIR)/gmp ; then \
-	  cd $(HOST_SUBDIR); mv gmp stageb2g0-gmp ; \
-	  mv prev-gmp stage1-gmp ; :  ; \
-	fi
-@endif gmp
-@if mpfr
-	@if test -d $(HOST_SUBDIR)/mpfr ; then \
-	  cd $(HOST_SUBDIR); mv mpfr stageb2g0-mpfr ; \
-	  mv prev-mpfr stage1-mpfr ; :  ; \
-	fi
-@endif mpfr
-@if ppl
-	@if test -d $(HOST_SUBDIR)/ppl ; then \
-	  cd $(HOST_SUBDIR); mv ppl stageb2g0-ppl ; \
-	  mv prev-ppl stage1-ppl ; :  ; \
-	fi
-@endif ppl
-@if cloog
-	@if test -d $(HOST_SUBDIR)/cloog ; then \
-	  cd $(HOST_SUBDIR); mv cloog stageb2g0-cloog ; \
-	  mv prev-cloog stage1-cloog ; :  ; \
-	fi
-@endif cloog
-@if gold
-	@if test -d $(HOST_SUBDIR)/gold ; then \
-	  cd $(HOST_SUBDIR); mv gold stageb2g0-gold ; \
-	  mv prev-gold stage1-gold ; :  ; \
-	fi
-@endif gold
-@if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stageb2g0-intl ; \
-	  mv prev-intl stage1-intl ; :  ; \
-	fi
-@endif intl
-@if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stageb2g0-ld ; \
-	  mv prev-ld stage1-ld ; :  ; \
-	fi
-@endif ld
-@if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stageb2g0-libcpp ; \
-	  mv prev-libcpp stage1-libcpp ; :  ; \
-	fi
-@endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stageb2g0-libdecnumber ; \
-	  mv prev-libdecnumber stage1-libdecnumber ; :  ; \
-	fi
-@endif libdecnumber
-@if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stageb2g0-libiberty ; \
-	  mv prev-libiberty stage1-libiberty ; :  ; \
-	fi
-@endif libiberty
-@if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stageb2g0-zlib ; \
-	  mv prev-zlib stage1-zlib ; :  ; \
-	fi
-@endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stageb2g0-$(TARGET_SUBDIR)  ; \
-	  mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
-	fi
-	rm -f stage_current
-
-# 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 either.
-.PHONY: stageb2g0-bubble
-stageb2g0-bubble:: stage1-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stageb2g0-lean || test -f stage1-lean  ; then \
-	  echo Skipping rebuild of stageb2g0 ; \
-	else \
-	  $(MAKE) stageb2g0-start; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageb2g0; \
-	fi
-
-.PHONY: all-stageb2g0 clean-stageb2g0
-do-clean: clean-stageb2g0
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-
-
-.PHONY: bootstrap2-debug bootstrap2-debug-lean
-bootstrap2-debug:
-	echo stageb2g0 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stageb2g0-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-bootstrap2-debug-lean:
-	echo stageb2g0 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stageb2g0-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage1:: distclean-stageb2g0 
-.PHONY: distclean-stageb2g0
-distclean-stageb2g0::
-	@: $(MAKE); $(stage)
-	@test "`cat stage_last`" != stageb2g0 || rm -f stage_last
-	rm -rf stageb2g0-* 
-
-
-@endif gcc-bootstrap
-
-
 .PHONY: stage3-start stage3-end
 
 stage3-start::
@@ -54088,6 +52249,7 @@ bootstrap:
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 bootstrap-lean:
@@ -54098,6 +52260,7 @@ bootstrap-lean:
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 
@@ -54119,328 +52282,7 @@ cleanstrap: do-distclean local-clean
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-@endif gcc-bootstrap
-
-
-.PHONY: stageb3g2-start stageb3g2-end
-
-stageb3g2-start::
-	@: $(MAKE); $(stage); \
-	echo stageb3g2 > stage_current ; \
-	echo stageb3g2 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-bfd ] || \
-	  mkdir stageb3g2-bfd; \
-	mv stageb3g2-bfd bfd  ; \
-	mv stageb2g0-bfd prev-bfd || test -f stageb2g0-lean 
-@endif bfd
-@if opcodes
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-opcodes ] || \
-	  mkdir stageb3g2-opcodes; \
-	mv stageb3g2-opcodes opcodes  ; \
-	mv stageb2g0-opcodes prev-opcodes || test -f stageb2g0-lean 
-@endif opcodes
-@if binutils
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-binutils ] || \
-	  mkdir stageb3g2-binutils; \
-	mv stageb3g2-binutils binutils  ; \
-	mv stageb2g0-binutils prev-binutils || test -f stageb2g0-lean 
-@endif binutils
-@if gas
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-gas ] || \
-	  mkdir stageb3g2-gas; \
-	mv stageb3g2-gas gas  ; \
-	mv stageb2g0-gas prev-gas || test -f stageb2g0-lean 
-@endif gas
-@if gcc
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-gcc ] || \
-	  mkdir stageb3g2-gcc; \
-	mv stageb3g2-gcc gcc  ; \
-	mv stageb2g0-gcc prev-gcc || test -f stageb2g0-lean 
-@endif gcc
-@if gmp
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-gmp ] || \
-	  mkdir stageb3g2-gmp; \
-	mv stageb3g2-gmp gmp  ; \
-	mv stageb2g0-gmp prev-gmp || test -f stageb2g0-lean 
-@endif gmp
-@if mpfr
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-mpfr ] || \
-	  mkdir stageb3g2-mpfr; \
-	mv stageb3g2-mpfr mpfr  ; \
-	mv stageb2g0-mpfr prev-mpfr || test -f stageb2g0-lean 
-@endif mpfr
-@if ppl
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-ppl ] || \
-	  mkdir stageb3g2-ppl; \
-	mv stageb3g2-ppl ppl  ; \
-	mv stageb2g0-ppl prev-ppl || test -f stageb2g0-lean 
-@endif ppl
-@if cloog
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-cloog ] || \
-	  mkdir stageb3g2-cloog; \
-	mv stageb3g2-cloog cloog  ; \
-	mv stageb2g0-cloog prev-cloog || test -f stageb2g0-lean 
-@endif cloog
-@if gold
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-gold ] || \
-	  mkdir stageb3g2-gold; \
-	mv stageb3g2-gold gold  ; \
-	mv stageb2g0-gold prev-gold || test -f stageb2g0-lean 
-@endif gold
-@if intl
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-intl ] || \
-	  mkdir stageb3g2-intl; \
-	mv stageb3g2-intl intl  ; \
-	mv stageb2g0-intl prev-intl || test -f stageb2g0-lean 
-@endif intl
-@if ld
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-ld ] || \
-	  mkdir stageb3g2-ld; \
-	mv stageb3g2-ld ld  ; \
-	mv stageb2g0-ld prev-ld || test -f stageb2g0-lean 
-@endif ld
-@if libcpp
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-libcpp ] || \
-	  mkdir stageb3g2-libcpp; \
-	mv stageb3g2-libcpp libcpp  ; \
-	mv stageb2g0-libcpp prev-libcpp || test -f stageb2g0-lean 
-@endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-libdecnumber ] || \
-	  mkdir stageb3g2-libdecnumber; \
-	mv stageb3g2-libdecnumber libdecnumber  ; \
-	mv stageb2g0-libdecnumber prev-libdecnumber || test -f stageb2g0-lean 
-@endif libdecnumber
-@if libiberty
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-libiberty ] || \
-	  mkdir stageb3g2-libiberty; \
-	mv stageb3g2-libiberty libiberty  ; \
-	mv stageb2g0-libiberty prev-libiberty || test -f stageb2g0-lean 
-@endif libiberty
-@if zlib
-	@cd $(HOST_SUBDIR); [ -d stageb3g2-zlib ] || \
-	  mkdir stageb3g2-zlib; \
-	mv stageb3g2-zlib zlib  ; \
-	mv stageb2g0-zlib prev-zlib || test -f stageb2g0-lean 
-@endif zlib
-	@[ -d stageb3g2-$(TARGET_SUBDIR) ] || \
-	  mkdir stageb3g2-$(TARGET_SUBDIR); \
-	mv stageb3g2-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-	mv stageb2g0-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageb2g0-lean 
-
-stageb3g2-end:: 
-@if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stageb3g2-bfd ; \
-	  mv prev-bfd stageb2g0-bfd ; :  ; \
-	fi
-@endif bfd
-@if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stageb3g2-opcodes ; \
-	  mv prev-opcodes stageb2g0-opcodes ; :  ; \
-	fi
-@endif opcodes
-@if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stageb3g2-binutils ; \
-	  mv prev-binutils stageb2g0-binutils ; :  ; \
-	fi
-@endif binutils
-@if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stageb3g2-gas ; \
-	  mv prev-gas stageb2g0-gas ; :  ; \
-	fi
-@endif gas
-@if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stageb3g2-gcc ; \
-	  mv prev-gcc stageb2g0-gcc ; :  ; \
-	fi
-@endif gcc
-@if gmp
-	@if test -d $(HOST_SUBDIR)/gmp ; then \
-	  cd $(HOST_SUBDIR); mv gmp stageb3g2-gmp ; \
-	  mv prev-gmp stageb2g0-gmp ; :  ; \
-	fi
-@endif gmp
-@if mpfr
-	@if test -d $(HOST_SUBDIR)/mpfr ; then \
-	  cd $(HOST_SUBDIR); mv mpfr stageb3g2-mpfr ; \
-	  mv prev-mpfr stageb2g0-mpfr ; :  ; \
-	fi
-@endif mpfr
-@if ppl
-	@if test -d $(HOST_SUBDIR)/ppl ; then \
-	  cd $(HOST_SUBDIR); mv ppl stageb3g2-ppl ; \
-	  mv prev-ppl stageb2g0-ppl ; :  ; \
-	fi
-@endif ppl
-@if cloog
-	@if test -d $(HOST_SUBDIR)/cloog ; then \
-	  cd $(HOST_SUBDIR); mv cloog stageb3g2-cloog ; \
-	  mv prev-cloog stageb2g0-cloog ; :  ; \
-	fi
-@endif cloog
-@if gold
-	@if test -d $(HOST_SUBDIR)/gold ; then \
-	  cd $(HOST_SUBDIR); mv gold stageb3g2-gold ; \
-	  mv prev-gold stageb2g0-gold ; :  ; \
-	fi
-@endif gold
-@if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stageb3g2-intl ; \
-	  mv prev-intl stageb2g0-intl ; :  ; \
-	fi
-@endif intl
-@if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stageb3g2-ld ; \
-	  mv prev-ld stageb2g0-ld ; :  ; \
-	fi
-@endif ld
-@if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stageb3g2-libcpp ; \
-	  mv prev-libcpp stageb2g0-libcpp ; :  ; \
-	fi
-@endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stageb3g2-libdecnumber ; \
-	  mv prev-libdecnumber stageb2g0-libdecnumber ; :  ; \
-	fi
-@endif libdecnumber
-@if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stageb3g2-libiberty ; \
-	  mv prev-libiberty stageb2g0-libiberty ; :  ; \
-	fi
-@endif libiberty
-@if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stageb3g2-zlib ; \
-	  mv prev-zlib stageb2g0-zlib ; :  ; \
-	fi
-@endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stageb3g2-$(TARGET_SUBDIR)  ; \
-	  mv prev-$(TARGET_SUBDIR) stageb2g0-$(TARGET_SUBDIR) ; :  ; \
-	fi
-	rm -f stage_current
-
-# 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 either.
-.PHONY: stageb3g2-bubble
-stageb3g2-bubble:: stageb2g0-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stageb3g2-lean || test -f stageb2g0-lean  ; then \
-	  echo Skipping rebuild of stageb3g2 ; \
-	else \
-	  $(MAKE) stageb3g2-start; \
-	  if $(LEAN); then \
-	    rm -rf stage1-* ; \
-	    $(STAMP) stage1-lean ; \
-	  fi; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageb3g2; \
-	fi
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) compare-debug
-
-.PHONY: all-stageb3g2 clean-stageb3g2
-do-clean: clean-stageb3g2
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-compare-debug:
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stageb2g0-lean; then \
-	  echo Cannot compare object files as stage b2g0 was deleted. ; \
-	  exit 0 ; \
-	fi; \
-	: $(MAKE); $(stage); \
-	rm -f .bad_compare ; \
-	echo Comparing stages b2g0 and b3g2 ; \
-	cd stageb3g2-gcc; \
-	files=`find . -name "*$(objext)" -print` ; \
-	cd .. ; \
-	for file in $${files} ; do \
-	  f1=$$r/stageb2g0-gcc/$$file; f2=$$r/stageb3g2-gcc/$$file; \
-	  $(do-compare-debug) > /dev/null 2>&1; \
-	  if test $$? -eq 1; then \
-	    case $$file in \
-	      ./cc*-checksum$(objext) | ./libgcc/* ) \
-	        echo warning: $$file differs ;; \
-	      *) \
-	        echo $$file differs >> .bad_compare ;; \
-	    esac ; \
-	  fi ; \
-	done ; \
-	if [ -f .bad_compare ]; then \
-	  echo "Bootstrap comparison failure!"; \
-	  cat .bad_compare; \
-	  exit 1; \
-	else \
-	  echo Comparison successful.; \
-	fi ; \
-	$(STAMP) compare-debug
-	if $(LEAN); then \
-	  rm -rf stageb2g0-*; \
-	  $(STAMP) stageb2g0-lean; \
-	fi
-
-
-
-.PHONY: bootstrap-debug bootstrap-debug-lean
-bootstrap-debug:
-	echo stageb3g2 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stageb3g2-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-bootstrap-debug-lean:
-	echo stageb3g2 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stageb3g2-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stageb2g0:: distclean-stageb3g2 
-.PHONY: distclean-stageb3g2
-distclean-stageb3g2::
-	@: $(MAKE); $(stage)
-	@test "`cat stage_last`" != stageb3g2 || rm -f stage_last
-	rm -rf stageb3g2-* compare-debug 
-
-
-.PHONY: cleanstrap-debug
-cleanstrap-debug: do-distclean local-clean
-	echo stageb3g2 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stageb3g2-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 @endif gcc-bootstrap
@@ -54732,6 +52574,7 @@ bootstrap4:
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 bootstrap4-lean:
@@ -54742,6 +52585,7 @@ bootstrap4-lean:
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 
@@ -55247,6 +53091,7 @@ profiledbootstrap:
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 profiledbootstrap-lean:
@@ -55257,6 +53102,7 @@ profiledbootstrap-lean:
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 
@@ -55304,7 +53150,7 @@ stage_current:
 .PHONY: restrap
 restrap::
 	@: $(MAKE); $(stage)
-	rm -rf stage1-$(TARGET_SUBDIR) stage2-* stageb2g0-* stage3-* stageb3g2-* stage4-* stageprofile-* stagefeedback-* 
+	rm -rf stage1-$(TARGET_SUBDIR) stage2-* stage3-* stage4-* stageprofile-* stagefeedback-*
 restrap:: all
 @endif gcc-bootstrap
 
@@ -55320,9 +53166,7 @@ configure-target-libssp: stage_last
 configure-target-newlib: stage_last
 configure-stage1-target-libgcc: maybe-all-stage1-gcc
 configure-stage2-target-libgcc: maybe-all-stage2-gcc
-configure-stageb2g0-target-libgcc: maybe-all-stageb2g0-gcc
 configure-stage3-target-libgcc: maybe-all-stage3-gcc
-configure-stageb3g2-target-libgcc: maybe-all-stageb3g2-gcc
 configure-stage4-target-libgcc: maybe-all-stage4-gcc
 configure-stageprofile-target-libgcc: maybe-all-stageprofile-gcc
 configure-stagefeedback-target-libgcc: maybe-all-stagefeedback-gcc
@@ -55399,9 +53243,7 @@ configure-gcc: maybe-configure-intl
 
 configure-stage1-gcc: maybe-configure-stage1-intl
 configure-stage2-gcc: maybe-configure-stage2-intl
-configure-stageb2g0-gcc: maybe-configure-stageb2g0-intl
 configure-stage3-gcc: maybe-configure-stage3-intl
-configure-stageb3g2-gcc: maybe-configure-stageb3g2-intl
 configure-stage4-gcc: maybe-configure-stage4-intl
 configure-stageprofile-gcc: maybe-configure-stageprofile-intl
 configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
@@ -55409,9 +53251,7 @@ configure-gcc: maybe-all-binutils
 
 configure-stage1-gcc: maybe-all-stage1-binutils
 configure-stage2-gcc: maybe-all-stage2-binutils
-configure-stageb2g0-gcc: maybe-all-stageb2g0-binutils
 configure-stage3-gcc: maybe-all-stage3-binutils
-configure-stageb3g2-gcc: maybe-all-stageb3g2-binutils
 configure-stage4-gcc: maybe-all-stage4-binutils
 configure-stageprofile-gcc: maybe-all-stageprofile-binutils
 configure-stagefeedback-gcc: maybe-all-stagefeedback-binutils
@@ -55419,9 +53259,7 @@ configure-gcc: maybe-all-gas
 
 configure-stage1-gcc: maybe-all-stage1-gas
 configure-stage2-gcc: maybe-all-stage2-gas
-configure-stageb2g0-gcc: maybe-all-stageb2g0-gas
 configure-stage3-gcc: maybe-all-stage3-gas
-configure-stageb3g2-gcc: maybe-all-stageb3g2-gas
 configure-stage4-gcc: maybe-all-stage4-gas
 configure-stageprofile-gcc: maybe-all-stageprofile-gas
 configure-stagefeedback-gcc: maybe-all-stagefeedback-gas
@@ -55429,9 +53267,7 @@ configure-gcc: maybe-all-ld
 
 configure-stage1-gcc: maybe-all-stage1-ld
 configure-stage2-gcc: maybe-all-stage2-ld
-configure-stageb2g0-gcc: maybe-all-stageb2g0-ld
 configure-stage3-gcc: maybe-all-stage3-ld
-configure-stageb3g2-gcc: maybe-all-stageb3g2-ld
 configure-stage4-gcc: maybe-all-stage4-ld
 configure-stageprofile-gcc: maybe-all-stageprofile-ld
 configure-stagefeedback-gcc: maybe-all-stagefeedback-ld
@@ -55439,9 +53275,7 @@ configure-gcc: maybe-all-gold
 
 configure-stage1-gcc: maybe-all-stage1-gold
 configure-stage2-gcc: maybe-all-stage2-gold
-configure-stageb2g0-gcc: maybe-all-stageb2g0-gold
 configure-stage3-gcc: maybe-all-stage3-gold
-configure-stageb3g2-gcc: maybe-all-stageb3g2-gold
 configure-stage4-gcc: maybe-all-stage4-gold
 configure-stageprofile-gcc: maybe-all-stageprofile-gold
 configure-stagefeedback-gcc: maybe-all-stagefeedback-gold
@@ -55449,9 +53283,7 @@ all-gcc: all-libiberty
 
 all-stage1-gcc: all-stage1-libiberty
 all-stage2-gcc: all-stage2-libiberty
-all-stageb2g0-gcc: all-stageb2g0-libiberty
 all-stage3-gcc: all-stage3-libiberty
-all-stageb3g2-gcc: all-stageb3g2-libiberty
 all-stage4-gcc: all-stage4-libiberty
 all-stageprofile-gcc: all-stageprofile-libiberty
 all-stagefeedback-gcc: all-stagefeedback-libiberty
@@ -55459,9 +53291,7 @@ all-gcc: maybe-all-gmp
 
 all-stage1-gcc: maybe-all-stage1-gmp
 all-stage2-gcc: maybe-all-stage2-gmp
-all-stageb2g0-gcc: maybe-all-stageb2g0-gmp
 all-stage3-gcc: maybe-all-stage3-gmp
-all-stageb3g2-gcc: maybe-all-stageb3g2-gmp
 all-stage4-gcc: maybe-all-stage4-gmp
 all-stageprofile-gcc: maybe-all-stageprofile-gmp
 all-stagefeedback-gcc: maybe-all-stagefeedback-gmp
@@ -55469,9 +53299,7 @@ all-gcc: maybe-all-intl
 
 all-stage1-gcc: maybe-all-stage1-intl
 all-stage2-gcc: maybe-all-stage2-intl
-all-stageb2g0-gcc: maybe-all-stageb2g0-intl
 all-stage3-gcc: maybe-all-stage3-intl
-all-stageb3g2-gcc: maybe-all-stageb3g2-intl
 all-stage4-gcc: maybe-all-stage4-intl
 all-stageprofile-gcc: maybe-all-stageprofile-intl
 all-stagefeedback-gcc: maybe-all-stagefeedback-intl
@@ -55479,9 +53307,7 @@ all-gcc: maybe-all-mpfr
 
 all-stage1-gcc: maybe-all-stage1-mpfr
 all-stage2-gcc: maybe-all-stage2-mpfr
-all-stageb2g0-gcc: maybe-all-stageb2g0-mpfr
 all-stage3-gcc: maybe-all-stage3-mpfr
-all-stageb3g2-gcc: maybe-all-stageb3g2-mpfr
 all-stage4-gcc: maybe-all-stage4-mpfr
 all-stageprofile-gcc: maybe-all-stageprofile-mpfr
 all-stagefeedback-gcc: maybe-all-stagefeedback-mpfr
@@ -55489,9 +53315,7 @@ all-gcc: maybe-all-ppl
 
 all-stage1-gcc: maybe-all-stage1-ppl
 all-stage2-gcc: maybe-all-stage2-ppl
-all-stageb2g0-gcc: maybe-all-stageb2g0-ppl
 all-stage3-gcc: maybe-all-stage3-ppl
-all-stageb3g2-gcc: maybe-all-stageb3g2-ppl
 all-stage4-gcc: maybe-all-stage4-ppl
 all-stageprofile-gcc: maybe-all-stageprofile-ppl
 all-stagefeedback-gcc: maybe-all-stagefeedback-ppl
@@ -55499,9 +53323,7 @@ all-gcc: maybe-all-cloog
 
 all-stage1-gcc: maybe-all-stage1-cloog
 all-stage2-gcc: maybe-all-stage2-cloog
-all-stageb2g0-gcc: maybe-all-stageb2g0-cloog
 all-stage3-gcc: maybe-all-stage3-cloog
-all-stageb3g2-gcc: maybe-all-stageb3g2-cloog
 all-stage4-gcc: maybe-all-stage4-cloog
 all-stageprofile-gcc: maybe-all-stageprofile-cloog
 all-stagefeedback-gcc: maybe-all-stagefeedback-cloog
@@ -55509,9 +53331,7 @@ all-gcc: maybe-all-build-texinfo
 
 all-stage1-gcc: maybe-all-build-texinfo
 all-stage2-gcc: maybe-all-build-texinfo
-all-stageb2g0-gcc: maybe-all-build-texinfo
 all-stage3-gcc: maybe-all-build-texinfo
-all-stageb3g2-gcc: maybe-all-build-texinfo
 all-stage4-gcc: maybe-all-build-texinfo
 all-stageprofile-gcc: maybe-all-build-texinfo
 all-stagefeedback-gcc: maybe-all-build-texinfo
@@ -55519,9 +53339,7 @@ all-gcc: maybe-all-build-bison
 
 all-stage1-gcc: maybe-all-build-bison
 all-stage2-gcc: maybe-all-build-bison
-all-stageb2g0-gcc: maybe-all-build-bison
 all-stage3-gcc: maybe-all-build-bison
-all-stageb3g2-gcc: maybe-all-build-bison
 all-stage4-gcc: maybe-all-build-bison
 all-stageprofile-gcc: maybe-all-build-bison
 all-stagefeedback-gcc: maybe-all-build-bison
@@ -55529,9 +53347,7 @@ all-gcc: maybe-all-build-byacc
 
 all-stage1-gcc: maybe-all-build-byacc
 all-stage2-gcc: maybe-all-build-byacc
-all-stageb2g0-gcc: maybe-all-build-byacc
 all-stage3-gcc: maybe-all-build-byacc
-all-stageb3g2-gcc: maybe-all-build-byacc
 all-stage4-gcc: maybe-all-build-byacc
 all-stageprofile-gcc: maybe-all-build-byacc
 all-stagefeedback-gcc: maybe-all-build-byacc
@@ -55539,9 +53355,7 @@ all-gcc: maybe-all-build-flex
 
 all-stage1-gcc: maybe-all-build-flex
 all-stage2-gcc: maybe-all-build-flex
-all-stageb2g0-gcc: maybe-all-build-flex
 all-stage3-gcc: maybe-all-build-flex
-all-stageb3g2-gcc: maybe-all-build-flex
 all-stage4-gcc: maybe-all-build-flex
 all-stageprofile-gcc: maybe-all-build-flex
 all-stagefeedback-gcc: maybe-all-build-flex
@@ -55549,9 +53363,7 @@ all-gcc: maybe-all-build-libiberty
 
 all-stage1-gcc: maybe-all-build-libiberty
 all-stage2-gcc: maybe-all-build-libiberty
-all-stageb2g0-gcc: maybe-all-build-libiberty
 all-stage3-gcc: maybe-all-build-libiberty
-all-stageb3g2-gcc: maybe-all-build-libiberty
 all-stage4-gcc: maybe-all-build-libiberty
 all-stageprofile-gcc: maybe-all-build-libiberty
 all-stagefeedback-gcc: maybe-all-build-libiberty
@@ -55559,9 +53371,7 @@ all-gcc: maybe-all-build-fixincludes
 
 all-stage1-gcc: maybe-all-build-fixincludes
 all-stage2-gcc: maybe-all-build-fixincludes
-all-stageb2g0-gcc: maybe-all-build-fixincludes
 all-stage3-gcc: maybe-all-build-fixincludes
-all-stageb3g2-gcc: maybe-all-build-fixincludes
 all-stage4-gcc: maybe-all-build-fixincludes
 all-stageprofile-gcc: maybe-all-build-fixincludes
 all-stagefeedback-gcc: maybe-all-build-fixincludes
@@ -55569,9 +53379,7 @@ all-gcc: maybe-all-zlib
 
 all-stage1-gcc: maybe-all-stage1-zlib
 all-stage2-gcc: maybe-all-stage2-zlib
-all-stageb2g0-gcc: maybe-all-stageb2g0-zlib
 all-stage3-gcc: maybe-all-stage3-zlib
-all-stageb3g2-gcc: maybe-all-stageb3g2-zlib
 all-stage4-gcc: maybe-all-stage4-zlib
 all-stageprofile-gcc: maybe-all-stageprofile-zlib
 all-stagefeedback-gcc: maybe-all-stagefeedback-zlib
@@ -55579,9 +53387,7 @@ all-gcc: all-libcpp
 
 all-stage1-gcc: all-stage1-libcpp
 all-stage2-gcc: all-stage2-libcpp
-all-stageb2g0-gcc: all-stageb2g0-libcpp
 all-stage3-gcc: all-stage3-libcpp
-all-stageb3g2-gcc: all-stageb3g2-libcpp
 all-stage4-gcc: all-stage4-libcpp
 all-stageprofile-gcc: all-stageprofile-libcpp
 all-stagefeedback-gcc: all-stagefeedback-libcpp
@@ -55589,9 +53395,7 @@ all-gcc: all-libdecnumber
 
 all-stage1-gcc: all-stage1-libdecnumber
 all-stage2-gcc: all-stage2-libdecnumber
-all-stageb2g0-gcc: all-stageb2g0-libdecnumber
 all-stage3-gcc: all-stage3-libdecnumber
-all-stageb3g2-gcc: all-stageb3g2-libdecnumber
 all-stage4-gcc: all-stage4-libdecnumber
 all-stageprofile-gcc: all-stageprofile-libdecnumber
 all-stagefeedback-gcc: all-stagefeedback-libdecnumber
@@ -55599,9 +53403,7 @@ all-gcc: maybe-all-libiberty
 
 all-stage1-gcc: maybe-all-stage1-libiberty
 all-stage2-gcc: maybe-all-stage2-libiberty
-all-stageb2g0-gcc: maybe-all-stageb2g0-libiberty
 all-stage3-gcc: maybe-all-stage3-libiberty
-all-stageb3g2-gcc: maybe-all-stageb3g2-libiberty
 all-stage4-gcc: maybe-all-stage4-libiberty
 all-stageprofile-gcc: maybe-all-stageprofile-libiberty
 all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty
@@ -55611,9 +53413,7 @@ configure-libcpp: configure-libiberty
 
 configure-stage1-libcpp: configure-stage1-libiberty
 configure-stage2-libcpp: configure-stage2-libiberty
-configure-stageb2g0-libcpp: configure-stageb2g0-libiberty
 configure-stage3-libcpp: configure-stage3-libiberty
-configure-stageb3g2-libcpp: configure-stageb3g2-libiberty
 configure-stage4-libcpp: configure-stage4-libiberty
 configure-stageprofile-libcpp: configure-stageprofile-libiberty
 configure-stagefeedback-libcpp: configure-stagefeedback-libiberty
@@ -55621,9 +53421,7 @@ configure-libcpp: maybe-configure-intl
 
 configure-stage1-libcpp: maybe-configure-stage1-intl
 configure-stage2-libcpp: maybe-configure-stage2-intl
-configure-stageb2g0-libcpp: maybe-configure-stageb2g0-intl
 configure-stage3-libcpp: maybe-configure-stage3-intl
-configure-stageb3g2-libcpp: maybe-configure-stageb3g2-intl
 configure-stage4-libcpp: maybe-configure-stage4-intl
 configure-stageprofile-libcpp: maybe-configure-stageprofile-intl
 configure-stagefeedback-libcpp: maybe-configure-stagefeedback-intl
@@ -55631,9 +53429,7 @@ all-libcpp: all-libiberty
 
 all-stage1-libcpp: all-stage1-libiberty
 all-stage2-libcpp: all-stage2-libiberty
-all-stageb2g0-libcpp: all-stageb2g0-libiberty
 all-stage3-libcpp: all-stage3-libiberty
-all-stageb3g2-libcpp: all-stageb3g2-libiberty
 all-stage4-libcpp: all-stage4-libiberty
 all-stageprofile-libcpp: all-stageprofile-libiberty
 all-stagefeedback-libcpp: all-stagefeedback-libiberty
@@ -55641,9 +53437,7 @@ all-libcpp: maybe-all-intl
 
 all-stage1-libcpp: maybe-all-stage1-intl
 all-stage2-libcpp: maybe-all-stage2-intl
-all-stageb2g0-libcpp: maybe-all-stageb2g0-intl
 all-stage3-libcpp: maybe-all-stage3-intl
-all-stageb3g2-libcpp: maybe-all-stageb3g2-intl
 all-stage4-libcpp: maybe-all-stage4-intl
 all-stageprofile-libcpp: maybe-all-stageprofile-intl
 all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
@@ -55653,9 +53447,7 @@ configure-mpfr: maybe-all-gmp
 
 configure-stage1-mpfr: maybe-all-stage1-gmp
 configure-stage2-mpfr: maybe-all-stage2-gmp
-configure-stageb2g0-mpfr: maybe-all-stageb2g0-gmp
 configure-stage3-mpfr: maybe-all-stage3-gmp
-configure-stageb3g2-mpfr: maybe-all-stageb3g2-gmp
 configure-stage4-mpfr: maybe-all-stage4-gmp
 configure-stageprofile-mpfr: maybe-all-stageprofile-gmp
 configure-stagefeedback-mpfr: maybe-all-stagefeedback-gmp
@@ -55663,9 +53455,7 @@ configure-ppl: maybe-all-gmp
 
 configure-stage1-ppl: maybe-all-stage1-gmp
 configure-stage2-ppl: maybe-all-stage2-gmp
-configure-stageb2g0-ppl: maybe-all-stageb2g0-gmp
 configure-stage3-ppl: maybe-all-stage3-gmp
-configure-stageb3g2-ppl: maybe-all-stageb3g2-gmp
 configure-stage4-ppl: maybe-all-stage4-gmp
 configure-stageprofile-ppl: maybe-all-stageprofile-gmp
 configure-stagefeedback-ppl: maybe-all-stagefeedback-gmp
@@ -55673,9 +53463,7 @@ configure-ppl: maybe-all-mpfr
 
 configure-stage1-ppl: maybe-all-stage1-mpfr
 configure-stage2-ppl: maybe-all-stage2-mpfr
-configure-stageb2g0-ppl: maybe-all-stageb2g0-mpfr
 configure-stage3-ppl: maybe-all-stage3-mpfr
-configure-stageb3g2-ppl: maybe-all-stageb3g2-mpfr
 configure-stage4-ppl: maybe-all-stage4-mpfr
 configure-stageprofile-ppl: maybe-all-stageprofile-mpfr
 configure-stagefeedback-ppl: maybe-all-stagefeedback-mpfr
@@ -55683,9 +53471,7 @@ configure-cloog: maybe-all-ppl
 
 configure-stage1-cloog: maybe-all-stage1-ppl
 configure-stage2-cloog: maybe-all-stage2-ppl
-configure-stageb2g0-cloog: maybe-all-stageb2g0-ppl
 configure-stage3-cloog: maybe-all-stage3-ppl
-configure-stageb3g2-cloog: maybe-all-stageb3g2-ppl
 configure-stage4-cloog: maybe-all-stage4-ppl
 configure-stageprofile-cloog: maybe-all-stageprofile-ppl
 configure-stagefeedback-cloog: maybe-all-stagefeedback-ppl
@@ -55710,9 +53496,7 @@ configure-bfd: configure-libiberty
 
 configure-stage1-bfd: configure-stage1-libiberty
 configure-stage2-bfd: configure-stage2-libiberty
-configure-stageb2g0-bfd: configure-stageb2g0-libiberty
 configure-stage3-bfd: configure-stage3-libiberty
-configure-stageb3g2-bfd: configure-stageb3g2-libiberty
 configure-stage4-bfd: configure-stage4-libiberty
 configure-stageprofile-bfd: configure-stageprofile-libiberty
 configure-stagefeedback-bfd: configure-stagefeedback-libiberty
@@ -55720,9 +53504,7 @@ configure-bfd: maybe-configure-intl
 
 configure-stage1-bfd: maybe-configure-stage1-intl
 configure-stage2-bfd: maybe-configure-stage2-intl
-configure-stageb2g0-bfd: maybe-configure-stageb2g0-intl
 configure-stage3-bfd: maybe-configure-stage3-intl
-configure-stageb3g2-bfd: maybe-configure-stageb3g2-intl
 configure-stage4-bfd: maybe-configure-stage4-intl
 configure-stageprofile-bfd: maybe-configure-stageprofile-intl
 configure-stagefeedback-bfd: maybe-configure-stagefeedback-intl
@@ -55730,9 +53512,7 @@ all-bfd: maybe-all-libiberty
 
 all-stage1-bfd: maybe-all-stage1-libiberty
 all-stage2-bfd: maybe-all-stage2-libiberty
-all-stageb2g0-bfd: maybe-all-stageb2g0-libiberty
 all-stage3-bfd: maybe-all-stage3-libiberty
-all-stageb3g2-bfd: maybe-all-stageb3g2-libiberty
 all-stage4-bfd: maybe-all-stage4-libiberty
 all-stageprofile-bfd: maybe-all-stageprofile-libiberty
 all-stagefeedback-bfd: maybe-all-stagefeedback-libiberty
@@ -55740,9 +53520,7 @@ all-bfd: maybe-all-intl
 
 all-stage1-bfd: maybe-all-stage1-intl
 all-stage2-bfd: maybe-all-stage2-intl
-all-stageb2g0-bfd: maybe-all-stageb2g0-intl
 all-stage3-bfd: maybe-all-stage3-intl
-all-stageb3g2-bfd: maybe-all-stageb3g2-intl
 all-stage4-bfd: maybe-all-stage4-intl
 all-stageprofile-bfd: maybe-all-stageprofile-intl
 all-stagefeedback-bfd: maybe-all-stagefeedback-intl
@@ -55750,9 +53528,7 @@ configure-opcodes: configure-libiberty
 
 configure-stage1-opcodes: configure-stage1-libiberty
 configure-stage2-opcodes: configure-stage2-libiberty
-configure-stageb2g0-opcodes: configure-stageb2g0-libiberty
 configure-stage3-opcodes: configure-stage3-libiberty
-configure-stageb3g2-opcodes: configure-stageb3g2-libiberty
 configure-stage4-opcodes: configure-stage4-libiberty
 configure-stageprofile-opcodes: configure-stageprofile-libiberty
 configure-stagefeedback-opcodes: configure-stagefeedback-libiberty
@@ -55760,9 +53536,7 @@ all-opcodes: maybe-all-libiberty
 
 all-stage1-opcodes: maybe-all-stage1-libiberty
 all-stage2-opcodes: maybe-all-stage2-libiberty
-all-stageb2g0-opcodes: maybe-all-stageb2g0-libiberty
 all-stage3-opcodes: maybe-all-stage3-libiberty
-all-stageb3g2-opcodes: maybe-all-stageb3g2-libiberty
 all-stage4-opcodes: maybe-all-stage4-libiberty
 all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
 all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
@@ -55770,9 +53544,7 @@ configure-binutils: maybe-configure-intl
 
 configure-stage1-binutils: maybe-configure-stage1-intl
 configure-stage2-binutils: maybe-configure-stage2-intl
-configure-stageb2g0-binutils: maybe-configure-stageb2g0-intl
 configure-stage3-binutils: maybe-configure-stage3-intl
-configure-stageb3g2-binutils: maybe-configure-stageb3g2-intl
 configure-stage4-binutils: maybe-configure-stage4-intl
 configure-stageprofile-binutils: maybe-configure-stageprofile-intl
 configure-stagefeedback-binutils: maybe-configure-stagefeedback-intl
@@ -55780,9 +53552,7 @@ all-binutils: maybe-all-libiberty
 
 all-stage1-binutils: maybe-all-stage1-libiberty
 all-stage2-binutils: maybe-all-stage2-libiberty
-all-stageb2g0-binutils: maybe-all-stageb2g0-libiberty
 all-stage3-binutils: maybe-all-stage3-libiberty
-all-stageb3g2-binutils: maybe-all-stageb3g2-libiberty
 all-stage4-binutils: maybe-all-stage4-libiberty
 all-stageprofile-binutils: maybe-all-stageprofile-libiberty
 all-stagefeedback-binutils: maybe-all-stagefeedback-libiberty
@@ -55790,9 +53560,7 @@ all-binutils: maybe-all-opcodes
 
 all-stage1-binutils: maybe-all-stage1-opcodes
 all-stage2-binutils: maybe-all-stage2-opcodes
-all-stageb2g0-binutils: maybe-all-stageb2g0-opcodes
 all-stage3-binutils: maybe-all-stage3-opcodes
-all-stageb3g2-binutils: maybe-all-stageb3g2-opcodes
 all-stage4-binutils: maybe-all-stage4-opcodes
 all-stageprofile-binutils: maybe-all-stageprofile-opcodes
 all-stagefeedback-binutils: maybe-all-stagefeedback-opcodes
@@ -55800,9 +53568,7 @@ all-binutils: maybe-all-bfd
 
 all-stage1-binutils: maybe-all-stage1-bfd
 all-stage2-binutils: maybe-all-stage2-bfd
-all-stageb2g0-binutils: maybe-all-stageb2g0-bfd
 all-stage3-binutils: maybe-all-stage3-bfd
-all-stageb3g2-binutils: maybe-all-stageb3g2-bfd
 all-stage4-binutils: maybe-all-stage4-bfd
 all-stageprofile-binutils: maybe-all-stageprofile-bfd
 all-stagefeedback-binutils: maybe-all-stagefeedback-bfd
@@ -55810,9 +53576,7 @@ all-binutils: maybe-all-build-flex
 
 all-stage1-binutils: maybe-all-build-flex
 all-stage2-binutils: maybe-all-build-flex
-all-stageb2g0-binutils: maybe-all-build-flex
 all-stage3-binutils: maybe-all-build-flex
-all-stageb3g2-binutils: maybe-all-build-flex
 all-stage4-binutils: maybe-all-build-flex
 all-stageprofile-binutils: maybe-all-build-flex
 all-stagefeedback-binutils: maybe-all-build-flex
@@ -55820,9 +53584,7 @@ all-binutils: maybe-all-build-bison
 
 all-stage1-binutils: maybe-all-build-bison
 all-stage2-binutils: maybe-all-build-bison
-all-stageb2g0-binutils: maybe-all-build-bison
 all-stage3-binutils: maybe-all-build-bison
-all-stageb3g2-binutils: maybe-all-build-bison
 all-stage4-binutils: maybe-all-build-bison
 all-stageprofile-binutils: maybe-all-build-bison
 all-stagefeedback-binutils: maybe-all-build-bison
@@ -55830,9 +53592,7 @@ all-binutils: maybe-all-build-byacc
 
 all-stage1-binutils: maybe-all-build-byacc
 all-stage2-binutils: maybe-all-build-byacc
-all-stageb2g0-binutils: maybe-all-build-byacc
 all-stage3-binutils: maybe-all-build-byacc
-all-stageb3g2-binutils: maybe-all-build-byacc
 all-stage4-binutils: maybe-all-build-byacc
 all-stageprofile-binutils: maybe-all-build-byacc
 all-stagefeedback-binutils: maybe-all-build-byacc
@@ -55840,9 +53600,7 @@ all-binutils: maybe-all-intl
 
 all-stage1-binutils: maybe-all-stage1-intl
 all-stage2-binutils: maybe-all-stage2-intl
-all-stageb2g0-binutils: maybe-all-stageb2g0-intl
 all-stage3-binutils: maybe-all-stage3-intl
-all-stageb3g2-binutils: maybe-all-stageb3g2-intl
 all-stage4-binutils: maybe-all-stage4-intl
 all-stageprofile-binutils: maybe-all-stageprofile-intl
 all-stagefeedback-binutils: maybe-all-stagefeedback-intl
@@ -55852,9 +53610,7 @@ configure-gas: maybe-configure-intl
 
 configure-stage1-gas: maybe-configure-stage1-intl
 configure-stage2-gas: maybe-configure-stage2-intl
-configure-stageb2g0-gas: maybe-configure-stageb2g0-intl
 configure-stage3-gas: maybe-configure-stage3-intl
-configure-stageb3g2-gas: maybe-configure-stageb3g2-intl
 configure-stage4-gas: maybe-configure-stage4-intl
 configure-stageprofile-gas: maybe-configure-stageprofile-intl
 configure-stagefeedback-gas: maybe-configure-stagefeedback-intl
@@ -55862,9 +53618,7 @@ all-gas: maybe-all-libiberty
 
 all-stage1-gas: maybe-all-stage1-libiberty
 all-stage2-gas: maybe-all-stage2-libiberty
-all-stageb2g0-gas: maybe-all-stageb2g0-libiberty
 all-stage3-gas: maybe-all-stage3-libiberty
-all-stageb3g2-gas: maybe-all-stageb3g2-libiberty
 all-stage4-gas: maybe-all-stage4-libiberty
 all-stageprofile-gas: maybe-all-stageprofile-libiberty
 all-stagefeedback-gas: maybe-all-stagefeedback-libiberty
@@ -55872,9 +53626,7 @@ all-gas: maybe-all-opcodes
 
 all-stage1-gas: maybe-all-stage1-opcodes
 all-stage2-gas: maybe-all-stage2-opcodes
-all-stageb2g0-gas: maybe-all-stageb2g0-opcodes
 all-stage3-gas: maybe-all-stage3-opcodes
-all-stageb3g2-gas: maybe-all-stageb3g2-opcodes
 all-stage4-gas: maybe-all-stage4-opcodes
 all-stageprofile-gas: maybe-all-stageprofile-opcodes
 all-stagefeedback-gas: maybe-all-stagefeedback-opcodes
@@ -55882,9 +53634,7 @@ all-gas: maybe-all-bfd
 
 all-stage1-gas: maybe-all-stage1-bfd
 all-stage2-gas: maybe-all-stage2-bfd
-all-stageb2g0-gas: maybe-all-stageb2g0-bfd
 all-stage3-gas: maybe-all-stage3-bfd
-all-stageb3g2-gas: maybe-all-stageb3g2-bfd
 all-stage4-gas: maybe-all-stage4-bfd
 all-stageprofile-gas: maybe-all-stageprofile-bfd
 all-stagefeedback-gas: maybe-all-stagefeedback-bfd
@@ -55892,9 +53642,7 @@ all-gas: maybe-all-intl
 
 all-stage1-gas: maybe-all-stage1-intl
 all-stage2-gas: maybe-all-stage2-intl
-all-stageb2g0-gas: maybe-all-stageb2g0-intl
 all-stage3-gas: maybe-all-stage3-intl
-all-stageb3g2-gas: maybe-all-stageb3g2-intl
 all-stage4-gas: maybe-all-stage4-intl
 all-stageprofile-gas: maybe-all-stageprofile-intl
 all-stagefeedback-gas: maybe-all-stagefeedback-intl
@@ -55907,9 +53655,7 @@ configure-ld: maybe-configure-intl
 
 configure-stage1-ld: maybe-configure-stage1-intl
 configure-stage2-ld: maybe-configure-stage2-intl
-configure-stageb2g0-ld: maybe-configure-stageb2g0-intl
 configure-stage3-ld: maybe-configure-stage3-intl
-configure-stageb3g2-ld: maybe-configure-stageb3g2-intl
 configure-stage4-ld: maybe-configure-stage4-intl
 configure-stageprofile-ld: maybe-configure-stageprofile-intl
 configure-stagefeedback-ld: maybe-configure-stagefeedback-intl
@@ -55917,9 +53663,7 @@ all-ld: maybe-all-libiberty
 
 all-stage1-ld: maybe-all-stage1-libiberty
 all-stage2-ld: maybe-all-stage2-libiberty
-all-stageb2g0-ld: maybe-all-stageb2g0-libiberty
 all-stage3-ld: maybe-all-stage3-libiberty
-all-stageb3g2-ld: maybe-all-stageb3g2-libiberty
 all-stage4-ld: maybe-all-stage4-libiberty
 all-stageprofile-ld: maybe-all-stageprofile-libiberty
 all-stagefeedback-ld: maybe-all-stagefeedback-libiberty
@@ -55927,9 +53671,7 @@ all-ld: maybe-all-bfd
 
 all-stage1-ld: maybe-all-stage1-bfd
 all-stage2-ld: maybe-all-stage2-bfd
-all-stageb2g0-ld: maybe-all-stageb2g0-bfd
 all-stage3-ld: maybe-all-stage3-bfd
-all-stageb3g2-ld: maybe-all-stageb3g2-bfd
 all-stage4-ld: maybe-all-stage4-bfd
 all-stageprofile-ld: maybe-all-stageprofile-bfd
 all-stagefeedback-ld: maybe-all-stagefeedback-bfd
@@ -55937,9 +53679,7 @@ all-ld: maybe-all-opcodes
 
 all-stage1-ld: maybe-all-stage1-opcodes
 all-stage2-ld: maybe-all-stage2-opcodes
-all-stageb2g0-ld: maybe-all-stageb2g0-opcodes
 all-stage3-ld: maybe-all-stage3-opcodes
-all-stageb3g2-ld: maybe-all-stageb3g2-opcodes
 all-stage4-ld: maybe-all-stage4-opcodes
 all-stageprofile-ld: maybe-all-stageprofile-opcodes
 all-stagefeedback-ld: maybe-all-stagefeedback-opcodes
@@ -55947,9 +53687,7 @@ all-ld: maybe-all-build-bison
 
 all-stage1-ld: maybe-all-build-bison
 all-stage2-ld: maybe-all-build-bison
-all-stageb2g0-ld: maybe-all-build-bison
 all-stage3-ld: maybe-all-build-bison
-all-stageb3g2-ld: maybe-all-build-bison
 all-stage4-ld: maybe-all-build-bison
 all-stageprofile-ld: maybe-all-build-bison
 all-stagefeedback-ld: maybe-all-build-bison
@@ -55957,9 +53695,7 @@ all-ld: maybe-all-build-byacc
 
 all-stage1-ld: maybe-all-build-byacc
 all-stage2-ld: maybe-all-build-byacc
-all-stageb2g0-ld: maybe-all-build-byacc
 all-stage3-ld: maybe-all-build-byacc
-all-stageb3g2-ld: maybe-all-build-byacc
 all-stage4-ld: maybe-all-build-byacc
 all-stageprofile-ld: maybe-all-build-byacc
 all-stagefeedback-ld: maybe-all-build-byacc
@@ -55967,9 +53703,7 @@ all-ld: maybe-all-build-flex
 
 all-stage1-ld: maybe-all-build-flex
 all-stage2-ld: maybe-all-build-flex
-all-stageb2g0-ld: maybe-all-build-flex
 all-stage3-ld: maybe-all-build-flex
-all-stageb3g2-ld: maybe-all-build-flex
 all-stage4-ld: maybe-all-build-flex
 all-stageprofile-ld: maybe-all-build-flex
 all-stagefeedback-ld: maybe-all-build-flex
@@ -55977,9 +53711,7 @@ all-ld: maybe-all-intl
 
 all-stage1-ld: maybe-all-stage1-intl
 all-stage2-ld: maybe-all-stage2-intl
-all-stageb2g0-ld: maybe-all-stageb2g0-intl
 all-stage3-ld: maybe-all-stage3-intl
-all-stageb3g2-ld: maybe-all-stageb3g2-intl
 all-stage4-ld: maybe-all-stage4-intl
 all-stageprofile-ld: maybe-all-stageprofile-intl
 all-stagefeedback-ld: maybe-all-stagefeedback-intl
@@ -55987,9 +53719,7 @@ configure-gold: maybe-configure-intl
 
 configure-stage1-gold: maybe-configure-stage1-intl
 configure-stage2-gold: maybe-configure-stage2-intl
-configure-stageb2g0-gold: maybe-configure-stageb2g0-intl
 configure-stage3-gold: maybe-configure-stage3-intl
-configure-stageb3g2-gold: maybe-configure-stageb3g2-intl
 configure-stage4-gold: maybe-configure-stage4-intl
 configure-stageprofile-gold: maybe-configure-stageprofile-intl
 configure-stagefeedback-gold: maybe-configure-stagefeedback-intl
@@ -55997,9 +53727,7 @@ all-gold: maybe-all-libiberty
 
 all-stage1-gold: maybe-all-stage1-libiberty
 all-stage2-gold: maybe-all-stage2-libiberty
-all-stageb2g0-gold: maybe-all-stageb2g0-libiberty
 all-stage3-gold: maybe-all-stage3-libiberty
-all-stageb3g2-gold: maybe-all-stageb3g2-libiberty
 all-stage4-gold: maybe-all-stage4-libiberty
 all-stageprofile-gold: maybe-all-stageprofile-libiberty
 all-stagefeedback-gold: maybe-all-stagefeedback-libiberty
@@ -56007,9 +53735,7 @@ all-gold: maybe-all-intl
 
 all-stage1-gold: maybe-all-stage1-intl
 all-stage2-gold: maybe-all-stage2-intl
-all-stageb2g0-gold: maybe-all-stageb2g0-intl
 all-stage3-gold: maybe-all-stage3-intl
-all-stageb3g2-gold: maybe-all-stageb3g2-intl
 all-stage4-gold: maybe-all-stage4-intl
 all-stageprofile-gold: maybe-all-stageprofile-intl
 all-stagefeedback-gold: maybe-all-stagefeedback-intl
@@ -56017,9 +53743,7 @@ all-gold: maybe-all-bfd
 
 all-stage1-gold: maybe-all-stage1-bfd
 all-stage2-gold: maybe-all-stage2-bfd
-all-stageb2g0-gold: maybe-all-stageb2g0-bfd
 all-stage3-gold: maybe-all-stage3-bfd
-all-stageb3g2-gold: maybe-all-stageb3g2-bfd
 all-stage4-gold: maybe-all-stage4-bfd
 all-stageprofile-gold: maybe-all-stageprofile-bfd
 all-stagefeedback-gold: maybe-all-stagefeedback-bfd
@@ -56027,9 +53751,7 @@ all-gold: maybe-all-build-bison
 
 all-stage1-gold: maybe-all-build-bison
 all-stage2-gold: maybe-all-build-bison
-all-stageb2g0-gold: maybe-all-build-bison
 all-stage3-gold: maybe-all-build-bison
-all-stageb3g2-gold: maybe-all-build-bison
 all-stage4-gold: maybe-all-build-bison
 all-stageprofile-gold: maybe-all-build-bison
 all-stagefeedback-gold: maybe-all-build-bison
@@ -56037,9 +53759,7 @@ all-gold: maybe-all-build-byacc
 
 all-stage1-gold: maybe-all-build-byacc
 all-stage2-gold: maybe-all-build-byacc
-all-stageb2g0-gold: maybe-all-build-byacc
 all-stage3-gold: maybe-all-build-byacc
-all-stageb3g2-gold: maybe-all-build-byacc
 all-stage4-gold: maybe-all-build-byacc
 all-stageprofile-gold: maybe-all-build-byacc
 all-stagefeedback-gold: maybe-all-build-byacc
@@ -56047,9 +53767,7 @@ check-gold: maybe-all-binutils
 
 check-stage1-gold: maybe-all-stage1-binutils
 check-stage2-gold: maybe-all-stage2-binutils
-check-stageb2g0-gold: maybe-all-stageb2g0-binutils
 check-stage3-gold: maybe-all-stage3-binutils
-check-stageb3g2-gold: maybe-all-stageb3g2-binutils
 check-stage4-gold: maybe-all-stage4-binutils
 check-stageprofile-gold: maybe-all-stageprofile-binutils
 check-stagefeedback-gold: maybe-all-stagefeedback-binutils
@@ -56057,9 +53775,7 @@ configure-opcodes: maybe-configure-intl
 
 configure-stage1-opcodes: maybe-configure-stage1-intl
 configure-stage2-opcodes: maybe-configure-stage2-intl
-configure-stageb2g0-opcodes: maybe-configure-stageb2g0-intl
 configure-stage3-opcodes: maybe-configure-stage3-intl
-configure-stageb3g2-opcodes: maybe-configure-stageb3g2-intl
 configure-stage4-opcodes: maybe-configure-stage4-intl
 configure-stageprofile-opcodes: maybe-configure-stageprofile-intl
 configure-stagefeedback-opcodes: maybe-configure-stagefeedback-intl
@@ -56067,9 +53783,7 @@ all-opcodes: maybe-all-bfd
 
 all-stage1-opcodes: maybe-all-stage1-bfd
 all-stage2-opcodes: maybe-all-stage2-bfd
-all-stageb2g0-opcodes: maybe-all-stageb2g0-bfd
 all-stage3-opcodes: maybe-all-stage3-bfd
-all-stageb3g2-opcodes: maybe-all-stageb3g2-bfd
 all-stage4-opcodes: maybe-all-stage4-bfd
 all-stageprofile-opcodes: maybe-all-stageprofile-bfd
 all-stagefeedback-opcodes: maybe-all-stagefeedback-bfd
@@ -56077,9 +53791,7 @@ all-opcodes: maybe-all-libiberty
 
 all-stage1-opcodes: maybe-all-stage1-libiberty
 all-stage2-opcodes: maybe-all-stage2-libiberty
-all-stageb2g0-opcodes: maybe-all-stageb2g0-libiberty
 all-stage3-opcodes: maybe-all-stage3-libiberty
-all-stageb3g2-opcodes: maybe-all-stageb3g2-libiberty
 all-stage4-opcodes: maybe-all-stage4-libiberty
 all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
 all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
@@ -56087,9 +53799,7 @@ all-opcodes: maybe-all-intl
 
 all-stage1-opcodes: maybe-all-stage1-intl
 all-stage2-opcodes: maybe-all-stage2-intl
-all-stageb2g0-opcodes: maybe-all-stageb2g0-intl
 all-stage3-opcodes: maybe-all-stage3-intl
-all-stageb3g2-opcodes: maybe-all-stageb3g2-intl
 all-stage4-opcodes: maybe-all-stage4-intl
 all-stageprofile-opcodes: maybe-all-stageprofile-intl
 all-stagefeedback-opcodes: maybe-all-stagefeedback-intl
diff --git a/Makefile.tpl b/Makefile.tpl
index dd2e1c1b0fd..056296a78bf 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -6,7 +6,7 @@ in
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
+#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
@@ -178,6 +178,8 @@ HOST_EXPORTS = \
 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
 	CXX="$(CXX)"; export CXX; \
 	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
+	GCJ="$(GCJ)"; export GCJ; \
+	GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
 	AR="$(AR)"; export AR; \
 	AS="$(AS)"; export AS; \
 	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@@ -213,11 +215,9 @@ HOST_EXPORTS = \
 POSTSTAGE1_HOST_EXPORTS = \
 	$(HOST_EXPORTS) \
 	CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
-	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
-	CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \
-	  $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
-	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
-	  -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
+	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ \
+	  $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
+	CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \
 	GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND \
 	LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS;
 
@@ -232,13 +232,13 @@ BASE_TARGET_EXPORTS = \
 	$(BASE_EXPORTS) \
 	AR="$(AR_FOR_TARGET)"; export AR; \
 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
-	CC="$(CC_FOR_TARGET)"; export CC; \
-	CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
-	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; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \
+	GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
 	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
 	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
@@ -254,11 +254,11 @@ BASE_TARGET_EXPORTS = \
 RAW_CXX_TARGET_EXPORTS = \
 	$(BASE_TARGET_EXPORTS) \
 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
-	CXX="$(RAW_CXX_FOR_TARGET)"; export CXX;
+	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
 
 NORMAL_TARGET_EXPORTS = \
 	$(BASE_TARGET_EXPORTS) \
-	CXX="$(CXX_FOR_TARGET)"; export CXX;
+	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
 
 # Where to find GMP
 HOST_GMPLIBS = @gmplibs@
@@ -358,48 +358,65 @@ LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 
+TFLAGS =
+
+# Defaults for all stages; some are overridden below.
+
+STAGE_CFLAGS = $(BOOT_CFLAGS)
+STAGE_TFLAGS = $(TFLAGS)
+STAGE_CONFIGURE_FLAGS=@stage2_werror_flag@
+
+[+ FOR bootstrap-stage +]
+# Defaults for stage [+id+]; some are overridden below.
+STAGE[+id+]_CFLAGS = $(STAGE_CFLAGS)
+STAGE[+id+]_TFLAGS = $(STAGE_TFLAGS)
+STAGE[+id+]_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+[+ ENDFOR bootstrap-stage +]
+
 # 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
 # only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS),
 # 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@
+# * We force-disable intermodule optimizations, even if
+#   --enable-intermodule was passed, since the installed compiler
+#   probably can't handle them.  Luckily, autoconf always respects
+#   the last argument when conflicting --enable arguments are passed.
+# * Likewise, we force-disable coverage flags, since the installed
+#   compiler probably has never heard of them.
+STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
+	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
 
-STAGE1_CFLAGS=@stage1_cflags@
-STAGE2_CFLAGS=$(BOOT_CFLAGS)
-STAGE3_CFLAGS=$(BOOT_CFLAGS)
-STAGE4_CFLAGS=$(BOOT_CFLAGS)
+STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
+STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
 
-STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
+STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use
+STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS)
 
 do-compare = @do_compare@
 do-compare3 = $(do-compare)
-do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
 
 # -----------------------------------------------
 # Programs producing files for the TARGET machine
 # -----------------------------------------------
 
-FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
-
 AR_FOR_TARGET=@AR_FOR_TARGET@
 AS_FOR_TARGET=@AS_FOR_TARGET@
-CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
+CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@
 
 # If GCC_FOR_TARGET is not overriden on the command line, then this
 # variable is passed down to the gcc Makefile, where it is used to
 # build libgcc2.a.  We define it here so that it can itself be
 # overridden on the command line.
-GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET)
+GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@
+CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@
+RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
+GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@
+GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
 DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
 LD_FOR_TARGET=@LD_FOR_TARGET@
 
@@ -417,13 +434,17 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_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@
 
 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 LDFLAGS_FOR_TARGET = 
 
+FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
+SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
+DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
+
+XGCC_FLAGS_FOR_TARGET = $(FLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
+
 # ------------------------------------
 # Miscellaneous targets and flag lists
 # ------------------------------------
@@ -473,7 +494,10 @@ HOST_LIB_PATH_[+module+] = \
 # Flags to pass down to all sub-makes.
 BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \
 	"`echo '[+flag+]=$([+flag+])' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"[+ ELSE optional +] \
-	"[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +] \
+	"[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +][+ FOR bootstrap-stage +] \
+	"STAGE[+id+]_CFLAGS=$(STAGE[+id+]_CFLAGS)" \
+	"STAGE[+id+]_TFLAGS=$(STAGE[+id+]_TFLAGS)"[+ ENDFOR bootstrap-stage +] \
+	"TFLAGS=$(TFLAGS)" \
 	"CONFIG_SHELL=$(SHELL)" \
 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
 
@@ -488,6 +512,8 @@ EXTRA_HOST_FLAGS = \
 	'CC=$(CC)' \
 	'CXX=$(CXX)' \
 	'DLLTOOL=$(DLLTOOL)' \
+	'GCJ=$(GCJ)' \
+	'GFORTRAN=$(GFORTRAN)' \
 	'LD=$(LD)' \
 	'LIPO=$(LIPO)' \
 	'NM=$(NM)' \
@@ -526,20 +552,24 @@ POSTSTAGE1_FLAGS_TO_PASS = \
 EXTRA_TARGET_FLAGS = \
 	'AR=$$(AR_FOR_TARGET)' \
 	'AS=$(COMPILER_AS_FOR_TARGET)' \
-	'CC=$$(CC_FOR_TARGET)' \
-	'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
-	'CXX=$$(CXX_FOR_TARGET)' \
-	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
+	'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
+	'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+	'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
 	'LD=$(COMPILER_LD_FOR_TARGET)' \
 	'LDFLAGS=$$(LDFLAGS_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)' \
+	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
+	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
 	'NM=$(COMPILER_NM_FOR_TARGET)' \
 	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
 	'WINDRES=$$(WINDRES_FOR_TARGET)' \
-	'WINDMC=$$(WINDMC_FOR_TARGET)'
+	'WINDMC=$$(WINDMC_FOR_TARGET)' \
+	'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
+	"TFLAGS=$$TFLAGS"
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 
@@ -559,6 +589,13 @@ EXTRA_GCC_FLAGS = \
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
 
+@if gcc
+BUILD_CONFIG =
+ifneq ($(BUILD_CONFIG),)
+include $(foreach CONFIG, $(BUILD_CONFIG), $(srcdir)/config/$(CONFIG).mk)
+endif
+@endif gcc
+
 .PHONY: configure-host
 configure-host: [+
   FOR host_modules +] \
@@ -582,11 +619,17 @@ all:
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if [ -f stage_last ]; then \
+@if gcc-bootstrap
+	if [ -f stage_last ]; then : ; \
+	  TFLAGS="$(STAGE$(shell sed s,^stage,, stage_last)_TFLAGS)"; \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
 	else \
+@endif gcc-bootstrap
 	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
-	fi
+@if gcc-bootstrap
+	fi; \
+@endif gcc-bootstrap
+	:
 
 .PHONY: all-build
 [+ FOR build_modules +]
@@ -867,6 +910,7 @@ configure-stage[+id+]-[+prefix+][+module+]:
 	@$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+]
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE[+id+]_TFLAGS)"; \
 	[+ IF check_multilibs
 	+]echo "Checking multilib configuration for [+module+]..."; \
 	$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \
@@ -882,11 +926,14 @@ configure-stage[+id+]-[+prefix+][+module+]:
 	fi; \
 	[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
 	[+exports+][+ IF 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; \
-	CXXFLAGS="[+stage_cflags+]"; export CXXFLAGS; [+ ENDIF +] \
+	[+poststage1_exports+][+ ENDIF prev +][+ IF prefix +] \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;[+ ELSE prefix +] \
+	CFLAGS="$(STAGE[+id+]_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE[+id+]_CFLAGS)"; export CXXFLAGS;[+ IF prev +] \
+	LIBCFLAGS="$(STAGE[+id+]_CFLAGS)"[+ ELSE prev +] \
+	LIBCFLAGS="$(LIBCFLAGS)"[+ ENDIF prev +]; export LIBCFLAGS;[+ ENDIF prefix +] \
 	echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
 	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
 	cd [+subdir+]/[+module+] || exit 1; \
@@ -899,9 +946,10 @@ configure-stage[+id+]-[+prefix+][+module+]:
 	libsrcdir="$$s/[+module+]"; \
 	$(SHELL) $${libsrcdir}/configure \
 	  [+args+] --build=${build_alias} --host=[+host_alias+] \
-	  --target=[+target_alias+] $${srcdiroption} \
-	  [+ IF prev +]--with-build-libsubdir=$(HOST_SUBDIR)[+ ENDIF prev +] \
-	  [+stage_configure_flags+] [+extra_configure_flags+]
+	  --target=[+target_alias+] $${srcdiroption} [+ IF prev +]\
+	  --with-build-libsubdir=$(HOST_SUBDIR) [+ ENDIF prev +]\
+	  $(STAGE[+id+]_CONFIGURE_FLAGS)[+ IF extra_configure_flags +] \
+	  [+extra_configure_flags+][+ ENDIF extra_configure_flags +]
 @endif [+prefix+][+module+]-bootstrap
 [+ ENDFOR bootstrap_stage +]
 [+ ENDIF bootstrap +]
@@ -941,16 +989,25 @@ all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
 	@[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE[+id+]_TFLAGS)"; \
 	[+exports+][+ IF prev +] \
 	[+poststage1_exports+][+ ENDIF prev +] \
 	cd [+subdir+]/[+module+] && \
-	$(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+] [+
+	$(MAKE) $(BASE_FLAGS_TO_PASS)[+ IF prefix +] \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"[+ ELSE prefix +] \
+		CFLAGS="$(STAGE[+id+]_CFLAGS)" \
+		CXXFLAGS="$(STAGE[+id+]_CFLAGS)"[+ IF prev +] \
+		LIBCFLAGS="$(STAGE[+id+]_CFLAGS)"[+ ELSE prev +] \
+		LIBCFLAGS="$(LIBCFLAGS)"[+ ENDIF prev +][+ ENDIF prefix +] \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		[+args+] [+
 		IF prev +][+poststage1_args+][+ ENDIF prev
 		+] [+extra_make_flags+] \
+		TFLAGS="$(STAGE[+id+]_TFLAGS)" \
 		$(TARGET-stage[+id+]-[+prefix+][+module+])
 
 maybe-clean-stage[+id+]-[+prefix+][+module+]: clean-stage[+id+]-[+prefix+][+module+]
@@ -1408,6 +1465,7 @@ do-clean: clean-stage[+id+]
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE[+id+]_TFLAGS)"; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 [+bootstrap-target+]-lean:
@@ -1418,6 +1476,7 @@ do-clean: clean-stage[+id+]
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE[+id+]_TFLAGS)"; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 [+ ENDIF bootstrap-target +]
 
@@ -1440,6 +1499,7 @@ distclean-stage[+id+]::
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE[+id+]_TFLAGS)"; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 [+ ENDIF cleanstrap-target +]
 @endif gcc-bootstrap
@@ -1477,8 +1537,8 @@ stage_current:
 .PHONY: restrap
 restrap::
 	@: $(MAKE); $(stage)
-	rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev
-	  +]stage[+id+]-* [+ ENDIF prev +][+ ENDFOR bootstrap-stage +]
+	rm -rf stage1-$(TARGET_SUBDIR)[+ FOR bootstrap-stage +][+ IF prev
+	  +] stage[+id+]-*[+ ENDIF prev +][+ ENDFOR bootstrap-stage +]
 restrap:: all
 @endif gcc-bootstrap
 
diff --git a/config/ChangeLog b/config/ChangeLog
index d670de4e371..e1ca63e7471 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* multi.m4: Save CXX, GFORTRAN and GCJ in config.status.
+	* mt-gnu (CXXFLAGS_FOR_TARGET): Adjust.
+	* bootstrap-O1.mk: New.
+	* bootstrap-O3.mk: New.
+	* bootstrap-debug.mk: New.
+
 2009-05-07  Paolo Bonzini
 
 	Sync from src:
diff --git a/config/bootstrap-O1.mk b/config/bootstrap-O1.mk
new file mode 100644
index 00000000000..031645a1251
--- /dev/null
+++ b/config/bootstrap-O1.mk
@@ -0,0 +1 @@
+BOOT_CFLAGS := -O1 $(filter-out -O%, $(BOOT_CFLAGS))
diff --git a/config/bootstrap-O3.mk b/config/bootstrap-O3.mk
new file mode 100644
index 00000000000..b269a3f7e12
--- /dev/null
+++ b/config/bootstrap-O3.mk
@@ -0,0 +1 @@
+BOOT_CFLAGS := -O3 $(filter-out -O%, $(BOOT_CFLAGS))
diff --git a/config/bootstrap-debug.mk b/config/bootstrap-debug.mk
new file mode 100644
index 00000000000..521be824194
--- /dev/null
+++ b/config/bootstrap-debug.mk
@@ -0,0 +1,2 @@
+STAGE2_CFLAGS += -g0
+do-compare = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
diff --git a/config/mt-gnu b/config/mt-gnu
index 2400fa44e55..15bf4171603 100644
--- a/config/mt-gnu
+++ b/config/mt-gnu
@@ -1,2 +1 @@
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
-	$(DEBUG_PREFIX_CFLAGS_FOR_TARGET) -D_GNU_SOURCE
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
diff --git a/config/multi.m4 b/config/multi.m4
index 98417679f51..5b62ecc0aa0 100644
--- a/config/multi.m4
+++ b/config/multi.m4
@@ -1,5 +1,5 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -62,4 +62,7 @@ with_target_subdir="$with_target_subdir"
 ac_configure_args="${multilib_arg} ${ac_configure_args}"
 multi_basedir="$multi_basedir"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-CC="$CC"])])dnl
+CC="$CC"
+CXX="$CXX"
+GFORTRAN="$GFORTRAN"
+GCJ="$GCJ"])])dnl
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e1c13f5884b..9388421627b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,92 @@
+2009-05-12  Paolo Bonzini  <bonzini@gnu.org>
+
+	* optabs.c (prepare_cmp_insn): Temporarily disable test that
+	causes spurious differences between trunk and cond-optab branch.
+
+2009-05-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR target/37137
+	* doc/install.texi (STAGE1_TFLAGS, BUILD_CONFIG): Document.
+
+2009-05-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* tree.c (iterative_hash_pointer): Delete.
+	(iterative_hash_expr): Short-circuit handling of NULL pointer.
+	Hash UIDs and versions of SSA names.  Don't special-case built-in
+	function declarations.
+
+2009-05-11  Ian Lance Taylor  <iant@google.com>
+
+	PR bootstrap/40103
+	* graphite.c: Force -Wc++-compat to only be a warning before
+	#including "cloog/cloog.h".
+
+2009-05-11  Martin Jambor  <mjambor@suse.cz>
+
+	* ipa-cp.c (ipcp_cloning_candidate_p): Add missing return false.
+	
+2009-05-11  Jan Hubicka  <jh@suse.cz>
+
+	* tree-ssa-loop-ivcanon.c: Include target.h
+	(struct loop_size): new structure.
+	(constant_after_peeling): New predicate.
+	(tree_estimate_loop_size): New function.
+	(estimated_unrolled_size): Rewrite for new estimates.
+	(try_unroll_loop_completely): Use new estimates.
+	* Makefile.in (tree-ssa-loop-ivcanon.o): Add dependenc on target.h
+
+2009-05-11  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+	* config/spu/spu-c.c (spu_categorize_keyword): Update for recent
+	libcpp interface change.
+	(spu_macro_to_expand): Likewise.
+
+2009-05-11  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR tree-optimization/40026
+	* gimplify.c (gimplify_init_constructor): Change initial conditional
+	to assertion.  Rewrite TREE_OPERAND (*expr_p, 1) after
+	optimize_compound_literals_in_ctor.
+
+2009-05-11  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* config/m68k/m68k-devices.def (52274, 52277, 5301x, 5225x, 51xx):
+	New devices.
+	* doc/invoke.texi (M680x0 Options): Document new coldfire cpus.
+
+2009-05-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* tree-vect-data-refs.c (vect_analyze_group_access): Use
+	HOST_WIDE_INT for gap.
+
+2009-05-11  Ira Rosen  <irar@il.ibm.com>
+
+	PR tree-optimization/40074
+	* tree-vect-data-refs.c (vect_analyze_group_access): Take gaps into
+	account in group size and step comparison.
+
+2009-05-11  Richard Guenther  <rguenther@suse.de>
+
+	* passes.c (init_optimization_passes): Strip now incorrect comment.
+	(execute_function_todo): Do not set PROP_alias.
+	* tree-pass.h (PROP_alias): Remove.
+	* tree-ssa-structalias.c (pass_build_alias): Do not provide PROP_alias.
+	* tree-if-conv.c (pass_if_conversion): Do not require PROP_alias.
+	* tree-nrv.c (pass_return_slot): Likewise.
+	* tree-object-size.c (pass_object_sizes): Likewise.
+	* tree-ssa-dom.c (pass_dominator): Likewise.
+	(pass_phi_only_cprop): Likewise.
+	* tree-ssa-dse.c (pass_dse): Likewise.
+	* tree-ssa-phiopt.c (pass_phiopt): Likewise.
+	(pass_cselim): Likewise.
+	* tree-ssa-pre.c (pass_pre): Likewise.
+	(pass_fre): Likewise.
+	* tree-ssa-reassoc.c (pass_reassoc): Likewise.
+	* tree-ssa-sink.c (pass_sink_code): Likewise.
+	* tree-stdarg.c (pass_stdarg): Likewise.
+	* tree-tailcall.c (pass_tail_calls): Likewise.
+	* tree-vrp.c (pass_vrp): Likewise.
+
 2009-05-10  Ian Lance Taylor  <iant@google.com>
 
 	* basic-block.h (enum profile_status): Break out of struct
diff --git a/gcc/ChangeLog.cond-optab b/gcc/ChangeLog.cond-optab
index 49030f527f4..172ca1ad0e6 100644
--- a/gcc/ChangeLog.cond-optab
+++ b/gcc/ChangeLog.cond-optab
@@ -1,3 +1,7 @@
+2009-05-12  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Merge trunk up to revision 147418.
+
 2009-05-11  Paolo Bonzini  <bonzini@gnu.org>
 
 	* Merge trunk up to revision 147359.
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 88a3462552b..26b3d32290c 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20090511
+20090512
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 9a4d62b007a..ab690282ea2 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2268,7 +2268,7 @@ tree-ssa-loop-ivcanon.o : tree-ssa-loop-ivcanon.c $(TREE_FLOW_H) $(CONFIG_H) \
    $(SYSTEM_H) $(RTL_H) $(TREE_H) $(TM_P_H) $(CFGLOOP_H) $(PARAMS_H) \
    $(TREE_INLINE_H) output.h $(DIAGNOSTIC_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \
    $(FLAGS_H) $(TREE_PASS_H) $(SCEV_H) $(BASIC_BLOCK_H) $(GGC_H) \
-   hard-reg-set.h tree-chrec.h
+   hard-reg-set.h tree-chrec.h $(TARGET_H)
 tree-ssa-loop-ch.o : tree-ssa-loop-ch.c $(TREE_FLOW_H) $(CONFIG_H) \
    $(SYSTEM_H) $(RTL_H) $(TREE_H) $(TM_P_H) $(CFGLOOP_H) $(TREE_INLINE_H) \
    output.h $(DIAGNOSTIC_H) $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \
diff --git a/gcc/config/m68k/m68k-devices.def b/gcc/config/m68k/m68k-devices.def
index 6f8f4c2e6e3..b89e7213f3f 100644
--- a/gcc/config/m68k/m68k-devices.def
+++ b/gcc/config/m68k/m68k-devices.def
@@ -81,7 +81,13 @@ M68K_DEVICE ("68332", m68332,   "68332", "cpu32", cpu32,    isa_cpu32, FL_MMU)
 M68K_DEVICE ("cpu32", cpu32,    "cpu32", "cpu32", cpu32,    isa_cpu32, FL_MMU)
 
 /* ColdFire CFV1 processor.  */
-M68K_DEVICE ("51qe",  mcf51qe,  "51qe",  "51qe",  cfv1,     isa_c,     FL_CF_USP)
+/* For historical reasons, the 51 multilib is named 51qe.  */
+M68K_DEVICE ("51",    mcf51,    "51",    "51qe",  cfv1,     isa_c,     FL_CF_USP)
+M68K_DEVICE ("51ac",  mcf51ac,  "51",    "51qe",  cfv1,     isa_c,     FL_CF_USP)
+M68K_DEVICE ("51cn",  mcf51cn,  "51",    "51qe",  cfv1,     isa_c,     FL_CF_USP)
+M68K_DEVICE ("51em",  mcf51em,  "51",    "51qe",  cfv1,     isa_c,     FL_CF_USP | FL_CF_MAC)
+M68K_DEVICE ("51jm",  mcf51jm,  "51",    "51qe",  cfv1,     isa_c,     FL_CF_USP)
+M68K_DEVICE ("51qe",  mcf51qe,  "51",    "51qe",  cfv1,     isa_c,     FL_CF_USP)
 
 /* ColdFire CFV2 processors.  */
 M68K_DEVICE ("5202",  mcf5202,  "5206",  "5206",  cfv2,     isa_a,     0)
@@ -107,6 +113,14 @@ M68K_DEVICE ("52234", mcf52234, "52235", "5208",  cfv2,     isa_aplus, FL_CF_HWD
 M68K_DEVICE ("52235", mcf52235, "52235", "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
 M68K_DEVICE ("5224",  mcf5224,  "5225",  "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_MAC)
 M68K_DEVICE ("5225",  mcf5225,  "5225",  "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_MAC)
+M68K_DEVICE ("52252", mcf52252, "52259", "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("52254", mcf52254, "52259", "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("52255", mcf52255, "52259", "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("52256", mcf52256, "52259", "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("52258", mcf52258, "52259", "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("52259", mcf52259, "52259", "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("52274", mcf52274, "52277", "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("52277", mcf52277, "52277", "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
 M68K_DEVICE ("5232",  mcf5232,  "5235",  "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
 M68K_DEVICE ("5233",  mcf5233,  "5235",  "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
 M68K_DEVICE ("5234",  mcf5234,  "5235",  "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
@@ -126,6 +140,13 @@ M68K_DEVICE ("5282",  mcf5282,  "5282",  "5208",  cfv2,     isa_aplus, FL_CF_HWD
 M68K_DEVICE ("528x",  mcf528x,  "5282",  "5208",  cfv2,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
 
 /* CFV3 processors.  */
+M68K_DEVICE ("53011", mcf53011, "53017", "5329",  cfv3,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("53012", mcf53012, "53017", "5329",  cfv3,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("53013", mcf53013, "53017", "5329",  cfv3,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("53014", mcf53014, "53017", "5329",  cfv3,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("53015", mcf53015, "53017", "5329",  cfv3,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("53016", mcf53016, "53017", "5329",  cfv3,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
+M68K_DEVICE ("53017", mcf53017, "53017", "5329",  cfv3,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
 M68K_DEVICE ("5307",  mcf5307,  "5307",  "5307",  cfv3,     isa_a,     FL_CF_HWDIV | FL_CF_MAC)
 M68K_DEVICE ("5327",  mcf5327,  "5329",  "5329",  cfv3,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
 M68K_DEVICE ("5328",  mcf5328,  "5329",  "5329",  cfv3,     isa_aplus, FL_CF_HWDIV | FL_CF_EMAC)
diff --git a/gcc/config/spu/spu-c.c b/gcc/config/spu/spu-c.c
index e1352b14a8a..a946b037cb7 100644
--- a/gcc/config/spu/spu-c.c
+++ b/gcc/config/spu/spu-c.c
@@ -42,7 +42,7 @@ spu_categorize_keyword (const cpp_token *tok)
 {
   if (tok->type == CPP_NAME)
     {
-      cpp_hashnode *ident = tok->val.node;
+      cpp_hashnode *ident = tok->val.node.node;
 
       if (ident == C_CPP_HASHNODE (vector_keyword)
 	  || ident == C_CPP_HASHNODE (__vector_keyword))
@@ -60,7 +60,7 @@ spu_categorize_keyword (const cpp_token *tok)
 static cpp_hashnode *
 spu_macro_to_expand (cpp_reader *pfile, const cpp_token *tok)
 {
-  cpp_hashnode *expand_this = tok->val.node;
+  cpp_hashnode *expand_this = tok->val.node.node;
   cpp_hashnode *ident;
 
   ident = spu_categorize_keyword (tok);
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 5788e68fac5..920d569664c 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -1982,7 +1982,7 @@ 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.
+compiler.  Use @code{STAGE1_TFLAGS} 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
@@ -2006,6 +2006,26 @@ the one you are building on: for example, you could build a
 @code{powerpc64-unknown-linux-gnu} host.  In this case, pass
 @option{--enable-bootstrap} to the configure script.
 
+@code{BUILD_CONFIG} can be used to bring in additional customization to
+the build.  It can be set to a whitespace-separated list of names.  For
+each such @code{NAME}, top-level @file{config/@code{NAME}.mk} will be
+included by the top-level @file{Makefile}, bringing in any settings it
+contains.  Some examples are:
+
+@table @asis
+@item @samp{bootstrap-O1}
+Removes any @option{-O}-started option from @code{BOOT_CFLAGS}, and adds
+@option{-O1} to it.  @samp{BUILD_CONFIG=bootstrap-O1} is equivalent to
+@samp{BOOT_CFLAGS='-g -O1'}.
+
+@item @samp{bootstrap-O3}
+Analogous to @code{bootstrap-O1}.
+
+@item @samp{bootstrap-debug}
+Builds stage2 without debug information, and uses
+@file{contrib/compare-debug} to compare object files.
+
+@end table
 
 @section Building a cross compiler
 
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 763654685bf..d40361eda15 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -12073,7 +12073,7 @@ below, which also classifies the CPUs into families:
 
 @multitable @columnfractions 0.20 0.80
 @item @strong{Family} @tab @strong{@samp{-mcpu} arguments}
-@item @samp{51qe} @tab @samp{51qe}
+@item @samp{51} @tab @samp{51} @samp{51ac} @samp{51cn} @samp{51em} @samp{51qe}
 @item @samp{5206} @tab @samp{5202} @samp{5204} @samp{5206}
 @item @samp{5206e} @tab @samp{5206e}
 @item @samp{5208} @tab @samp{5207} @samp{5208}
@@ -12082,6 +12082,7 @@ below, which also classifies the CPUs into families:
 @item @samp{5216} @tab @samp{5214} @samp{5216}
 @item @samp{52235} @tab @samp{52230} @samp{52231} @samp{52232} @samp{52233} @samp{52234} @samp{52235}
 @item @samp{5225} @tab @samp{5224} @samp{5225}
+@item @samp{52259} @tab @samp{52252} @samp{52254} @samp{52255} @samp{52256} @samp{52258} @samp{52259}
 @item @samp{5235} @tab @samp{5232} @samp{5233} @samp{5234} @samp{5235} @samp{523x}
 @item @samp{5249} @tab @samp{5249}
 @item @samp{5250} @tab @samp{5250}
@@ -12089,6 +12090,7 @@ below, which also classifies the CPUs into families:
 @item @samp{5272} @tab @samp{5272}
 @item @samp{5275} @tab @samp{5274} @samp{5275}
 @item @samp{5282} @tab @samp{5280} @samp{5281} @samp{5282} @samp{528x}
+@item @samp{53017} @tab @samp{53011} @samp{53012} @samp{53013} @samp{53014} @samp{53015} @samp{53016} @samp{53017}
 @item @samp{5307} @tab @samp{5307}
 @item @samp{5329} @tab @samp{5327} @samp{5328} @samp{5329} @samp{532x}
 @item @samp{5373} @tab @samp{5372} @samp{5373} @samp{537x}
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 97f56b20141..7544345b356 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,13 @@
+2009-05-11  Steve Ellcey  <sje@cup.hp.com>
+
+	* resolve.c (check_host_association): Initialize tail.
+
+2009-05-11  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/40089
+	* resolve.c (resolve_fl_derived): Only return FAILURE if
+	gfc_notify_std fails.
+
 2009-05-10  Ian Lance Taylor  <iant@google.com>
 
 	* gfortran.h (enum gfc_omp_sched_kind): New enum, broken out of
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 34cb365a562..b7550f5780e 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -4353,7 +4353,7 @@ check_host_association (gfc_expr *e)
   gfc_symtree *st;
   int n;
   gfc_ref *ref;
-  gfc_actual_arglist *arg, *tail;
+  gfc_actual_arglist *arg, *tail = NULL;
   bool retval = e->expr_type == EXPR_FUNCTION;
 
   /*  If the expression is the result of substitution in
@@ -9086,14 +9086,12 @@ resolve_fl_derived (gfc_symbol *sym)
 	  && !is_sym_host_assoc (c->ts.derived, sym->ns)
 	  && !c->ts.derived->attr.use_assoc
 	  && !gfc_check_access (c->ts.derived->attr.access,
-				c->ts.derived->ns->default_access))
-	{
-	  gfc_notify_std (GFC_STD_F2003, "Fortran 2003: the component '%s' "
-			  "is a PRIVATE type and cannot be a component of "
-			  "'%s', which is PUBLIC at %L", c->name,
-			  sym->name, &sym->declared_at);
-	  return FAILURE;
-	}
+				c->ts.derived->ns->default_access)
+	  && gfc_notify_std (GFC_STD_F2003, "Fortran 2003: the component '%s' "
+			     "is a PRIVATE type and cannot be a component of "
+			     "'%s', which is PUBLIC at %L", c->name,
+			     sym->name, &sym->declared_at) == FAILURE)
+	return FAILURE;
 
       if (sym->attr.sequence)
 	{
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 0c33dab479a..bff7cdd4b6f 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -3643,14 +3643,11 @@ static enum gimplify_status
 gimplify_init_constructor (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
 			   bool want_value, bool notify_temp_creation)
 {
-  tree object, new_ctor;
-  tree ctor = TREE_OPERAND (*expr_p, 1);
-  tree type = TREE_TYPE (ctor);
+  tree object, ctor, type;
   enum gimplify_status ret;
   VEC(constructor_elt,gc) *elts;
 
-  if (TREE_CODE (ctor) != CONSTRUCTOR)
-    return GS_UNHANDLED;
+  gcc_assert (TREE_CODE (TREE_OPERAND (*expr_p, 1)) == CONSTRUCTOR);
 
   if (!notify_temp_creation)
     {
@@ -3661,8 +3658,10 @@ gimplify_init_constructor (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
     }
 
   object = TREE_OPERAND (*expr_p, 0);
-  new_ctor = optimize_compound_literals_in_ctor (ctor);
-  elts = CONSTRUCTOR_ELTS (new_ctor);
+  ctor = TREE_OPERAND (*expr_p, 1) =
+    optimize_compound_literals_in_ctor (TREE_OPERAND (*expr_p, 1));
+  type = TREE_TYPE (ctor);
+  elts = CONSTRUCTOR_ELTS (ctor);
   ret = GS_ALL_DONE;
 
   switch (TREE_CODE (type))
diff --git a/gcc/graphite.c b/gcc/graphite.c
index e106f480cbc..6b497a808f7 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -56,6 +56,13 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple.h"
 
 #ifdef HAVE_cloog
+
+/* The CLooG header file is not -Wc++-compat ready as of 2009-05-11.
+   This #pragma should be removed when it is ready.  */
+#if GCC_VERSION >= 4003
+#pragma GCC diagnostic warning "-Wc++-compat"
+#endif
+
 #include "cloog/cloog.h"
 #include "graphite.h"
 
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index d6390b089a9..7761aab92d6 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -438,6 +438,7 @@ ipcp_cloning_candidate_p (struct cgraph_node *node)
       if (dump_file)
 	fprintf (dump_file, "Not considering %s for cloning; no hot calls.\n",
 		 cgraph_node_name (node));
+      return false;
     }
   if (dump_file)
     fprintf (dump_file, "Considering %s for cloning.\n",
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index f10c219b0d8..960e1144f91 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Make-lang.in (GCJ): Renamed to...
+	(XGCJ): ... this.
+
 2009-04-27  Ian Lance Taylor  <iant@google.com>
 
 	* builtins.c (java_builtins): Add casts to enum type.
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 605f7e3434c..fafa94ae766 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -44,10 +44,10 @@
 JAVA_INSTALL_NAME := $(shell echo gcj|sed '$(program_transform_name)')
 JAVA_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gcj|sed '$(program_transform_name)')
 
-GCJ = gcj
+XGCJ = gcj
 
 # Define the names for selecting java in LANGUAGES.
-java: jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) jcf-dump$(exeext)
+java: jc1$(exeext) $(XGCJ)$(exeext) jvgenmain$(exeext) jcf-dump$(exeext)
 
 # Define the name of target independent tools to be installed in $(bindir)
 # Names are subject to changes
@@ -62,17 +62,17 @@ jvspec.o: $(srcdir)/java/jvspec.c $(SYSTEM_H) coretypes.h $(TM_H) \
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \
 		$(INCLUDES) $(srcdir)/java/jvspec.c $(OUTPUT_OPTION))
 
-# Create the compiler driver for $(GCJ).
-$(GCJ)$(exeext): $(GCC_OBJS) jvspec.o java/jcf-path.o version.o \
+# Create the compiler driver for $(XGCJ).
+$(XGCJ)$(exeext): $(GCC_OBJS) jvspec.o java/jcf-path.o version.o \
 	   prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCC_OBJS) jvspec.o \
 	  java/jcf-path.o prefix.o intl.o \
 	  version.o $(EXTRA_GCC_OBJS) $(LIBS)
 
-# Create a version of the $(GCJ) driver which calls the cross-compiler.
-$(GCJ)-cross$(exeext): $(GCJ)$(exeext)
-	-rm -f $(GCJ)-cross$(exeext)
-	cp $(GCJ)$(exeext) $(GCJ)-cross$(exeext)
+# Create a version of the $(XGCJ) driver which calls the cross-compiler.
+$(XGCJ)-cross$(exeext): $(XGCJ)$(exeext)
+	-rm -f $(XGCJ)-cross$(exeext)
+	cp $(XGCJ)$(exeext) $(XGCJ)-cross$(exeext)
 
 java.srcextra:
 
@@ -115,8 +115,8 @@ jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS)
 #
 # Build hooks:
 
-java.all.cross: $(GCJ)-cross$(exeext)
-java.start.encap: $(GCJ)$(exeext)
+java.all.cross: $(XGCJ)-cross$(exeext)
+java.start.encap: $(XGCJ)$(exeext)
 java.rest.encap:
 
 
@@ -158,11 +158,11 @@ check-java-subtargets :
 
 # Install gcj as well as the target-independent tools.
 java.install-common: installdirs
-	-if [ -f $(GCJ)$(exeext) ]; then \
+	-if [ -f $(XGCJ)$(exeext) ]; then \
 	  rm -f $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
-	  $(INSTALL_PROGRAM) $(GCJ)$(exeext) $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
+	  $(INSTALL_PROGRAM) $(XGCJ)$(exeext) $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
 	  chmod a+x $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
-	  if [ -f $(GCJ)-cross$(exeext) ]; then \
+	  if [ -f $(XGCJ)-cross$(exeext) ]; then \
 	    true; \
 	  else \
 	    rm -f $(DESTDIR)$(bindir)/$(JAVA_TARGET_INSTALL_NAME)$(exeext); \
@@ -211,7 +211,7 @@ java.install-pdf: $(JAVA_PDFFILES)
 java.mostlyclean:
 	-rm -f java/*$(objext) $(DEMANGLER_PROG)
 	-rm -f java/*$(coverageexts)
-	-rm -f jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) \
+	-rm -f jc1$(exeext) $(XGCJ)$(exeext) jvgenmain$(exeext) \
           jcf-dump$(exeext) s-java
 java.clean:
 java.distclean:
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 16a29c43110..970f1501700 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -4015,18 +4015,6 @@ prepare_cmp_insn (rtx x, rtx y, enum rtx_code comparison, rtx size,
   gcc_assert (methods == OPTAB_DIRECT || methods == OPTAB_WIDEN
 	      || methods == OPTAB_LIB_WIDEN);
 
-  /* If we are inside an appropriately-short loop and we are optimizing,
-     force expensive constants into a register.  */
-  if (CONSTANT_P (x) && optimize
-      && (rtx_cost (x, COMPARE, optimize_insn_for_speed_p ())
-          > COSTS_N_INSNS (1)))
-    x = force_reg (mode, x);
-
-  if (CONSTANT_P (y) && optimize
-      && (rtx_cost (y, COMPARE, optimize_insn_for_speed_p ())
-          > COSTS_N_INSNS (1)))
-    y = force_reg (mode, y);
-
 #ifdef HAVE_cc0
   /* Make sure if we have a canonical comparison.  The RTL
      documentation states that canonical comparisons are required only
diff --git a/gcc/passes.c b/gcc/passes.c
index 7a39ac70bc1..b66ed1d340b 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -595,13 +595,6 @@ init_optimization_passes (void)
       NEXT_PASS (pass_complete_unrolli);
       NEXT_PASS (pass_ccp);
       NEXT_PASS (pass_forwprop);
-      /* Ideally the function call conditional
-	 dead code elimination phase can be delayed
-	 till later where potentially more opportunities
-	 can be found.  Due to lack of good ways to
-	 update VDEFs associated with the shrink-wrapped
-	 calls, it is better to do the transformation
-	 here where memory SSA is not built yet.  */
       NEXT_PASS (pass_call_cdce);
       /* pass_build_alias is a dummy pass that ensures that we
 	 execute TODO_rebuild_alias at this point.  Re-building
@@ -956,7 +949,6 @@ execute_function_todo (void *data)
       if (!(flags & TODO_update_address_taken))
 	execute_update_addresses_taken (true);
       compute_may_aliases ();
-      cfun->curr_properties |= PROP_alias;
     }
   
   if (flags & TODO_remove_unused_locals)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ca5cf9f7cc9..b6b0949c3de 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,41 @@
+2009-05-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR tree-optimization/38632
+	* g++.dg/tree-ssa/pr38632.C: New.
+
+2009-05-11  Jan Hubicka  <jh@suse.cz>
+
+	* gcc.dg/tree-ssa/pr21829.c: Simplify matching since
+	we now optimize better.
+	* gcc.dg/Wunreachable-8.c: Bogus warnings now come
+	out at different places.
+	* gcc.dg/vect/vect-92.c: Increase loop iteration count to prevent
+	unroling.
+	* gcc.dg/vect/vect-76.c: Likewise.
+	* gcc.dg/vect/vect-70.c: Likewise.
+	* gcc.dg/vect/vect-66.c: Likewise.
+	* gcc.dg/vect/no-section-anchors-vect-66.c: Likewise.
+	* gcc.dg/vect/slp-3.c: One of loops gets now fully unrolled.
+
+2009-05-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR middle-end/40080
+	* gcc.c-torture/compile/pr40080.c: New.
+
+2009-05-11  Paolo Bonzini  <bonzini@gnu.org>
+
+	* gcc.c-torture/compile/pr40026.c: New testcase.
+
+2009-05-11  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/40089
+	* gfortran.dg/proc_ptr_comp_7.f90: New.
+
+2009-05-11  Ira Rosen  <irar@il.ibm.com>
+
+	PR tree-optimization/40074
+	* gcc.dg/vect/pr40074.c: New test.
+
 2009-05-10  Ian Lance Taylor  <iant@google.com>
 
 	* gcc.dg/Wcxx-compat-7.c: New testcase.
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr38632.C b/gcc/testsuite/g++.dg/tree-ssa/pr38632.C
new file mode 100644
index 00000000000..04fca228021
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr38632.C
@@ -0,0 +1,22 @@
+// { dg-do compile }
+// { dg-require-effective-target pthread } 
+// { dg-options "-O -ftree-parallelize-loops=2" }
+
+void foo();
+
+void bar(int n, char *p)
+{
+  try
+  {
+    foo();
+    ++n;
+    foo();
+    for (int i = 0; i < n-1; ++i)
+      p[i] = 0;
+  }
+  catch (...)
+  {
+    for (int i = 0; i < n; ++i)
+      p[i] = 0;
+  }
+}
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr40026.c b/gcc/testsuite/gcc.c-torture/compile/pr40026.c
new file mode 100644
index 00000000000..0d08f0dc8ac
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr40026.c
@@ -0,0 +1,15 @@
+typedef struct {
+    unsigned long bits;
+} S;
+struct T {
+    S span;
+    int flags;
+};
+
+struct T f(int x)
+{
+  return (struct T) {
+      .span = (S) { 0UL },
+      .flags = (x ? 256 : 0),
+  };
+}
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr40080.c b/gcc/testsuite/gcc.c-torture/compile/pr40080.c
new file mode 100644
index 00000000000..e36f14273e8
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr40080.c
@@ -0,0 +1,44 @@
+extern void *ff(void*,int);
+
+struct lpgl { struct lpgl *next; };
+struct lpgd { struct lpgl *first; };
+
+typedef int (*xfn)( );
+static void xDP_IF_EnumGroupsInGroup ( void *a, int b, xfn fn)
+{
+  struct lpgd *lpGData;
+  struct lpgl *lpGList;
+
+  if( ( lpGData = ff( a, b ) ) == ((void *)0) )
+    return;
+
+  if( lpGData->first  == ((void *)0) )
+    return;
+  lpGList = lpGData->first;
+
+  for( ;; ) {
+    if( !(*fn)( ) )
+      return;
+    if( lpGList->next == ((void *)0) )
+      break;
+    lpGList = lpGList->next;
+  }
+  return;
+}
+
+
+static int 
+xcbDeletePlayerFromAllGroups() {
+  xDP_IF_EnumGroupsInGroup(0, 0, 0);
+  return 1;
+}
+
+void xDP_IF_EnumGroups( xfn fn) {
+  xDP_IF_EnumGroupsInGroup( 0, 0, fn);
+}
+
+static void xDP_IF_DestroyPlayer () {
+  xDP_IF_EnumGroups( xcbDeletePlayerFromAllGroups);
+}
+
+void* foo=xDP_IF_DestroyPlayer;
diff --git a/gcc/testsuite/gcc.dg/Wunreachable-2.c b/gcc/testsuite/gcc.dg/Wunreachable-2.c
index 8242441b0be..55a8f9cca01 100644
--- a/gcc/testsuite/gcc.dg/Wunreachable-2.c
+++ b/gcc/testsuite/gcc.dg/Wunreachable-2.c
@@ -9,8 +9,8 @@ void bar (void)
 {
   int i;
 
-  for (i = 0; i < 2; i++)
-    if (! foo (a[i]))
+  for (i = 0; i < 2; i++)  /* { dg-bogus "will never be executed" "" { xfail *-*-* } } */
+    if (! foo (a[i]))  /* { dg-bogus "will never be executed" "" { xfail *-*-* } } */
       return;
 
   baz ();	/* { dg-bogus "will never be executed" } */
diff --git a/gcc/testsuite/gcc.dg/Wunreachable-8.c b/gcc/testsuite/gcc.dg/Wunreachable-8.c
index 81254ba3b2a..1a13d64243e 100644
--- a/gcc/testsuite/gcc.dg/Wunreachable-8.c
+++ b/gcc/testsuite/gcc.dg/Wunreachable-8.c
@@ -4,7 +4,7 @@ float Factorial(float X)
 {
   float val = 1.0;
   int k,j;
-  for (k=1; k < 5; k++)
+  for (k=1; k < 5; k++) /* { dg-bogus "will never be executed" "" { xfail *-*-* } } */
     {
       val += 1.0; /* { dg-bogus "will never be executed" "" { xfail *-*-* } } */
     }
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21829.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21829.c
index 6b5c4bbf1ce..c95714ab9fb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21829.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21829.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-tree-cddce2" } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
 
 int test(int v)
 {
@@ -16,33 +16,7 @@ int test(int v)
   return x;
 }
 
-/* This should be optimized to
+/* This should be unrolled and optimized into conditional set of return value "v < 0".  */
 
-    if (v <= 0) goto <L1>; else goto <L3>;
-
-   <L1>:;
-
-    # x_1 = PHI <0(3), 1(1)>;
-   <L3>:;
-    return x_1;
-
-   retaining only a single conditional.  This doesn't work as nobody
-   combines the two tests
-
-    if (v < 0) goto <bb 4>; else goto <bb 3>;
-
-   <bb 3>:
-
-    if (v <= 0) goto <bb 4>; else goto <bb 5>;
-
-   this late in the game.  tree-ssa-ifcombine.c would do it if we would
-   unroll the loop during early loop unrolling though.
-
-   For now vrp2 does all the needed folding and threading and cddce2
-   provides a nice IL to scan.  */
-
-/* { dg-final { scan-tree-dump-times "if " 1 "optimized" { xfail *-*-* } } } */
-/* { dg-final { scan-tree-dump-times "if " 2 "cddce2" } } */
-/* { dg-final { scan-tree-dump "x_. = PHI <0\\\(.\\\), 1\\\(.\\\)>" "cddce2" } } */
-/* { dg-final { cleanup-tree-dump "cddce2" } } */
+/* { dg-final { scan-tree-dump-not "if \\(" "optimized" } } */
 /* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-66.c b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-66.c
index d590975e57f..49a9098f79f 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-66.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-66.c
@@ -3,7 +3,7 @@
 #include <stdarg.h>
 #include "tree-vect.h"
 
-#define N 8
+#define N 16
 
 int ia[8][5][N+2];
 int ic[16][16][5][N+2];
diff --git a/gcc/testsuite/gcc.dg/vect/pr40074.c b/gcc/testsuite/gcc.dg/vect/pr40074.c
new file mode 100644
index 00000000000..6459f1b552e
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/pr40074.c
@@ -0,0 +1,54 @@
+/* { dg-require-effective-target vect_int } */
+
+#include <stdarg.h>
+#include "tree-vect.h"
+
+#define N 16 
+
+typedef struct {
+   int a;
+   int b;
+   int c;
+   int d;
+} s;
+
+
+s arr[N] = {{7,0,1,5}, {7,2,3,5}, {7,4,5,5}, {7,6,7,5}, {7,8,9,5}, {7,10,11,5}, {7,12,13,5}, {7,14,15,5}, {7,16,17,5}, {7,18,19,5}, {7,20,21,5}, {7,22,23,5}, {7,24,25,5}, {7,26,27,5}, {7,28,29,5}, {7,30,31,5}};
+
+__attribute__ ((noinline)) int
+main1 ()
+{
+  s *p = arr, *q = arr + 1;
+  int res[N];
+  int i;
+
+  for (i = 0; i < N-1; i++)
+    {
+      res[i] = p->b + p->d + q->b;
+      p++;
+      q++;
+    }
+  
+  /* check results:  */
+  for (i = 0; i < N-1; i++)
+    {
+      if (res[i] != arr[i].b + arr[i].d + arr[i+1].b)
+	abort ();
+    }
+
+  return 0;
+}
+
+int main (void)
+{
+  int i;
+  
+  check_vect ();
+
+  main1 ();
+
+  return 0;
+}
+
+/* { dg-final { cleanup-tree-dump "vect" } } */
+  
diff --git a/gcc/testsuite/gcc.dg/vect/slp-3.c b/gcc/testsuite/gcc.dg/vect/slp-3.c
index 070715371bb..1bb9884a644 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-3.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-3.c
@@ -142,7 +142,8 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_align } } } */
-/* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect" { xfail vect_no_align } } } */
+/* One of the loops gets complettely unrolled.  */
+/* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" { xfail vect_no_align } } } */
+/* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { xfail vect_no_align } } } */
 /* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-66.c b/gcc/testsuite/gcc.dg/vect/vect-66.c
index a332fa024b9..e0b23cd6550 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-66.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-66.c
@@ -3,7 +3,7 @@
 #include <stdarg.h>
 #include "tree-vect.h"
 
-#define N 8
+#define N 16
 
 __attribute__ ((noinline))
 void main1 ()
diff --git a/gcc/testsuite/gcc.dg/vect/vect-70.c b/gcc/testsuite/gcc.dg/vect/vect-70.c
index df7de31f34e..23b1902e54f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-70.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-70.c
@@ -3,7 +3,7 @@
 #include <stdarg.h>
 #include "tree-vect.h"
 
-#define N 12
+#define N 24
 
 struct s{
   int m;
diff --git a/gcc/testsuite/gcc.dg/vect/vect-76.c b/gcc/testsuite/gcc.dg/vect/vect-76.c
index 847b5e5259d..7097e7a821e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-76.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-76.c
@@ -3,7 +3,7 @@
 #include <stdarg.h>
 #include "tree-vect.h"
 
-#define N 12
+#define N 24
 #define OFF 4
 
 /* Check handling of accesses for which the "initial condition" -
diff --git a/gcc/testsuite/gcc.dg/vect/vect-92.c b/gcc/testsuite/gcc.dg/vect/vect-92.c
index 01c751fbfa3..3a64e251cb2 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-92.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-92.c
@@ -22,13 +22,13 @@ main1 ()
 {
   int i;
 
-  for (i = 0; i < 5; i++)
+  for (i = 0; i < 10; i++)
     {
       pa[i+1] = pb[i+1] * pc[i+1];
     }
 
   /* check results:  */
-  for (i = 0; i < 5; i++)
+  for (i = 0; i < 10; i++)
     {
       if (pa[i+1] != (pb[i+1] * pc[i+1]))
 	abort ();
@@ -42,13 +42,13 @@ main2 ()
 {
   int i;
 
-  for (i = 0; i < 6; i++)
+  for (i = 0; i < 12; i++)
     {
       pa[i+1] = pb[i+1] * pc[i+1];
     }
 
   /* check results:  */
-  for (i = 0; i < 6; i++)
+  for (i = 0; i < 12; i++)
     {
       if (pa[i+1] != (pb[i+1] * pc[i+1]))
 	abort ();
diff --git a/gcc/testsuite/gfortran.dg/proc_ptr_comp_7.f90 b/gcc/testsuite/gfortran.dg/proc_ptr_comp_7.f90
new file mode 100644
index 00000000000..860c2dd9b81
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/proc_ptr_comp_7.f90
@@ -0,0 +1,40 @@
+! { dg-do compile }
+!
+! PR 40089: Public type with public component which has a private type
+!
+! Original test case by Juergen Reuter <reuter@physik.uni-freiburg.de>
+! Adapted by Janus Weil <janus@gcc.gnu.org>
+
+module m
+
+  implicit none
+  private
+
+  public :: public_t
+
+  type :: private_t
+    integer :: i
+  end type
+
+  type :: public_t
+     type(private_t), pointer :: public_comp_with_private_type
+     procedure(ifc) , nopass, pointer :: ppc
+  end type
+
+  abstract interface
+     integer function ifc ()
+     end function
+  end interface
+
+end module m
+
+program test
+use m
+implicit none
+type(public_t) :: x
+integer :: j
+j = x%ppc()
+end
+
+! { dg-final { cleanup-modules "m" } }
+
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 70c6149a494..c1b05328fa6 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -1163,7 +1163,7 @@ struct gimple_opt_pass pass_if_conversion =
   NULL,					/* next */
   0,					/* static_pass_number */
   TV_NONE,				/* tv_id */
-  PROP_cfg | PROP_ssa | PROP_alias,	/* properties_required */
+  PROP_cfg | PROP_ssa,			/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
diff --git a/gcc/tree-nrv.c b/gcc/tree-nrv.c
index 07245cd6d7b..c1e9d605679 100644
--- a/gcc/tree-nrv.c
+++ b/gcc/tree-nrv.c
@@ -360,7 +360,7 @@ struct gimple_opt_pass pass_return_slot =
   NULL,					/* next */
   0,					/* static_pass_number */
   TV_NONE,				/* tv_id */
-  PROP_ssa | PROP_alias,		/* properties_required */
+  PROP_ssa,				/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c
index d99bc238576..18e62e860fd 100644
--- a/gcc/tree-object-size.c
+++ b/gcc/tree-object-size.c
@@ -1113,7 +1113,7 @@ struct gimple_opt_pass pass_object_sizes =
   NULL,					/* next */
   0,					/* static_pass_number */
   TV_NONE,				/* tv_id */
-  PROP_cfg | PROP_ssa | PROP_alias,	/* properties_required */
+  PROP_cfg | PROP_ssa,			/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h
index 464de5e0cdb..0237bcef188 100644
--- a/gcc/tree-pass.h
+++ b/gcc/tree-pass.h
@@ -215,9 +215,8 @@ struct dump_file_info
 #define PROP_ssa		(1 << 5)
 #define PROP_no_crit_edges      (1 << 6)
 #define PROP_rtl		(1 << 7)
-#define PROP_alias		(1 << 8)
-#define PROP_gimple_lomp	(1 << 9)	/* lowered OpenMP directives */
-#define PROP_cfglayout	 	(1 << 10)	/* cfglayout mode on RTL */
+#define PROP_gimple_lomp	(1 << 8)	/* lowered OpenMP directives */
+#define PROP_cfglayout	 	(1 << 9)	/* cfglayout mode on RTL */
 
 #define PROP_trees \
   (PROP_gimple_any | PROP_gimple_lcf | PROP_gimple_leh | PROP_gimple_lomp)
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index a134244bd9f..a041f0e2e27 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -768,7 +768,7 @@ struct gimple_opt_pass pass_dominator =
   NULL,					/* next */
   0,					/* static_pass_number */
   TV_TREE_SSA_DOMINATOR_OPTS,		/* tv_id */
-  PROP_cfg | PROP_ssa | PROP_alias,	/* properties_required */
+  PROP_cfg | PROP_ssa,			/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
@@ -2923,7 +2923,7 @@ struct gimple_opt_pass pass_phi_only_cprop =
   NULL,                                 /* next */
   0,                                    /* static_pass_number */
   TV_TREE_PHI_CPROP,                    /* tv_id */
-  PROP_cfg | PROP_ssa | PROP_alias,     /* properties_required */
+  PROP_cfg | PROP_ssa,			/* properties_required */
   0,                                    /* properties_provided */
   0,		                        /* properties_destroyed */
   0,                                    /* todo_flags_start */
diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index 315b5507b71..5df1aa16841 100644
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.c
@@ -460,9 +460,7 @@ struct gimple_opt_pass pass_dse =
   NULL,				/* next */
   0,				/* static_pass_number */
   TV_TREE_DSE,			/* tv_id */
-  PROP_cfg
-    | PROP_ssa
-    | PROP_alias,		/* properties_required */
+  PROP_cfg | PROP_ssa,		/* properties_required */
   0,				/* properties_provided */
   0,				/* properties_destroyed */
   0,				/* todo_flags_start */
diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c
index 21010734be6..8e45bbb97e6 100644
--- a/gcc/tree-ssa-loop-ivcanon.c
+++ b/gcc/tree-ssa-loop-ivcanon.c
@@ -53,6 +53,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "params.h"
 #include "flags.h"
 #include "tree-inline.h"
+#include "target.h"
 
 /* Specifies types of loops that may be unrolled.  */
 
@@ -118,7 +119,7 @@ tree_num_loop_insns (struct loop *loop, eni_weights *weights)
 {
   basic_block *body = get_loop_body (loop);
   gimple_stmt_iterator gsi;
-  unsigned size = 1, i;
+  unsigned size = 0, i;
 
   for (i = 0; i < loop->num_nodes; i++)
     for (gsi = gsi_start_bb (body[i]); !gsi_end_p (gsi); gsi_next (&gsi))
@@ -128,28 +129,195 @@ tree_num_loop_insns (struct loop *loop, eni_weights *weights)
   return size;
 }
 
-/* Estimate number of insns of completely unrolled loop.  We assume
-   that the size of the unrolled loop is decreased in the
-   following way (the numbers of insns are based on what
-   estimate_num_insns returns for appropriate statements):
+/* Describe size of loop as detected by tree_estimate_loop_size.  */
+struct loop_size
+{
+  /* Number of instructions in the loop.  */
+  int overall;
+
+  /* Number of instructions that will be likely optimized out in
+     peeled iterations of loop  (i.e. computation based on induction
+     variable where induction variable starts at known constant.)  */
+  int eliminated_by_peeling;
+
+  /* Same statistics for last iteration of loop: it is smaller because
+     instructions after exit are not executed.  */
+  int last_iteration;
+  int last_iteration_eliminated_by_peeling;
+};
+
+/* Return true if OP in STMT will be constant after peeling LOOP.  */
+
+static bool
+constant_after_peeling (tree op, gimple stmt, struct loop *loop)
+{
+  affine_iv iv;
+
+  if (is_gimple_min_invariant (op))
+    return true;
+  
+  /* We can still fold accesses to constant arrays when index is known.  */
+  if (TREE_CODE (op) != SSA_NAME)
+    {
+      tree base = op;
+
+      /* First make fast look if we see constant array inside.  */
+      while (handled_component_p (base))
+	base = TREE_OPERAND (base, 0);
+      if ((DECL_P (base)
+      	   && TREE_STATIC (base)
+	   && TREE_READONLY (base)
+           && (DECL_INITIAL (base)
+	       || (!DECL_EXTERNAL (base)
+		   && targetm.binds_local_p (base))))
+	  || CONSTANT_CLASS_P (base))
+	{
+	  /* If so, see if we understand all the indices.  */
+	  base = op;
+	  while (handled_component_p (base))
+	    {
+	      if (TREE_CODE (base) == ARRAY_REF
+		  && !constant_after_peeling (TREE_OPERAND (base, 1), stmt, loop))
+		return false;
+	      base = TREE_OPERAND (base, 0);
+	    }
+	  return true;
+	}
+      return false;
+    }
+
+  /* Induction variables are constants.  */
+  if (!simple_iv (loop, loop_containing_stmt (stmt), op, &iv, false))
+    return false;
+  if (!is_gimple_min_invariant (iv.base))
+    return false;
+  if (!is_gimple_min_invariant (iv.step))
+    return false;
+  return true;
+}
+
+/* Computes an estimated number of insns in LOOP, weighted by WEIGHTS.
+   Return results in SIZE, estimate benefits for complete unrolling exiting by EXIT.  */
+
+static void
+tree_estimate_loop_size (struct loop *loop, edge exit, struct loop_size *size)
+{
+  basic_block *body = get_loop_body (loop);
+  gimple_stmt_iterator gsi;
+  unsigned int i;
+  bool after_exit;
+
+  size->overall = 0;
+  size->eliminated_by_peeling = 0;
+  size->last_iteration = 0;
+  size->last_iteration_eliminated_by_peeling = 0;
+
+  if (dump_file && (dump_flags & TDF_DETAILS))
+    fprintf (dump_file, "Estimating sizes for loop %i\n", loop->num);
+  for (i = 0; i < loop->num_nodes; i++)
+    {
+      if (exit && body[i] != exit->src
+	  && dominated_by_p (CDI_DOMINATORS, body[i], exit->src))
+	after_exit = true;
+      else
+	after_exit = false;
+      if (dump_file && (dump_flags & TDF_DETAILS))
+	fprintf (dump_file, " BB: %i, after_exit: %i\n", body[i]->index, after_exit);
+
+      for (gsi = gsi_start_bb (body[i]); !gsi_end_p (gsi); gsi_next (&gsi))
+	{
+	  gimple stmt = gsi_stmt (gsi);
+	  int num = estimate_num_insns (stmt, &eni_size_weights);
+	  bool likely_eliminated = false;
+
+	  if (dump_file && (dump_flags & TDF_DETAILS))
+	    {
+	      fprintf (dump_file, "  size: %3i ", num);
+	      print_gimple_stmt (dump_file, gsi_stmt (gsi), 0, 0);
+	    }
+
+	  /* Look for reasons why we might optimize this stmt away. */
+
+	  /* Exit conditional.  */
+	  if (body[i] == exit->src && stmt == last_stmt (exit->src))
+	    {
+	      if (dump_file && (dump_flags & TDF_DETAILS))
+	        fprintf (dump_file, "   Exit condition will be eliminated.\n");
+	      likely_eliminated = true;
+	    }
+	  /* Sets of IV variables  */
+	  else if (gimple_code (stmt) == GIMPLE_ASSIGN
+	      && constant_after_peeling (gimple_assign_lhs (stmt), stmt, loop))
+	    {
+	      if (dump_file && (dump_flags & TDF_DETAILS))
+	        fprintf (dump_file, "   Induction variable computation will"
+			 " be folded away.\n");
+	      likely_eliminated = true;
+	    }
+	  /* Assignments of IV variables.  */
+	  else if (gimple_code (stmt) == GIMPLE_ASSIGN
+		   && TREE_CODE (gimple_assign_lhs (stmt)) == SSA_NAME
+		   && constant_after_peeling (gimple_assign_rhs1 (stmt), stmt,loop)
+		   && (gimple_assign_rhs_class (stmt) != GIMPLE_BINARY_RHS
+		       || constant_after_peeling (gimple_assign_rhs2 (stmt),
+		       				  stmt, loop)))
+	    {
+	      if (dump_file && (dump_flags & TDF_DETAILS))
+	        fprintf (dump_file, "   Constant expression will be folded away.\n");
+	      likely_eliminated = true;
+	    }
+	  /* Conditionals.  */
+	  else if (gimple_code (stmt) == GIMPLE_COND
+		   && constant_after_peeling (gimple_cond_lhs (stmt), stmt, loop)
+		   && constant_after_peeling (gimple_cond_rhs (stmt), stmt, loop))
+	    {
+	      if (dump_file && (dump_flags & TDF_DETAILS))
+	        fprintf (dump_file, "   Constant conditional.\n");
+	      likely_eliminated = true;
+	    }
+
+	  size->overall += num;
+	  if (likely_eliminated)
+	    size->eliminated_by_peeling += num;
+	  if (!after_exit)
+	    {
+	      size->last_iteration += num;
+	      if (likely_eliminated)
+		size->last_iteration_eliminated_by_peeling += num;
+	    }
+	}
+    }
+  if (dump_file && (dump_flags & TDF_DETAILS))
+    fprintf (dump_file, "size: %i-%i, last_iteration: %i-%i\n", size->overall,
+    	     size->eliminated_by_peeling, size->last_iteration,
+	     size->last_iteration_eliminated_by_peeling);
+  
+  free (body);
+}
 
-   1) exit condition gets removed (2 insns)
-   2) increment of the control variable gets removed (2 insns)
-   3) All remaining statements are likely to get simplified
-      due to constant propagation.  Hard to estimate; just
-      as a heuristics we decrease the rest by 1/3.
+/* Estimate number of insns of completely unrolled loop.
+   It is (NUNROLL + 1) * size of loop body with taking into account
+   the fact that in last copy everything after exit conditional
+   is dead and that some instructions will be eliminated after
+   peeling.
 
-   NINSNS is the number of insns in the loop before unrolling.
-   NUNROLL is the number of times the loop is unrolled.  */
+   Loop body is likely going to simplify futher, this is difficult
+   to guess, we just decrease the result by 1/3.  */
 
 static unsigned HOST_WIDE_INT
-estimated_unrolled_size (unsigned HOST_WIDE_INT ninsns,
+estimated_unrolled_size (struct loop_size *size,
 			 unsigned HOST_WIDE_INT nunroll)
 {
-  HOST_WIDE_INT unr_insns = 2 * ((HOST_WIDE_INT) ninsns - 4) / 3;
+  HOST_WIDE_INT unr_insns = ((nunroll)
+  			     * (HOST_WIDE_INT) (size->overall
+			     			- size->eliminated_by_peeling));
+  if (!nunroll)
+    unr_insns = 0;
+  unr_insns += size->last_iteration - size->last_iteration_eliminated_by_peeling;
+
+  unr_insns = unr_insns * 2 / 3;
   if (unr_insns <= 0)
     unr_insns = 1;
-  unr_insns *= (nunroll + 1);
 
   return unr_insns;
 }
@@ -165,6 +333,7 @@ try_unroll_loop_completely (struct loop *loop,
 {
   unsigned HOST_WIDE_INT n_unroll, ninsns, max_unroll, unr_insns;
   gimple cond;
+  struct loop_size size;
 
   if (loop->inner)
     return false;
@@ -182,9 +351,10 @@ try_unroll_loop_completely (struct loop *loop,
       if (ul == UL_SINGLE_ITER)
 	return false;
 
-      ninsns = tree_num_loop_insns (loop, &eni_size_weights);
+      tree_estimate_loop_size (loop, exit, &size);
+      ninsns = size.overall;
 
-      unr_insns = estimated_unrolled_size (ninsns, n_unroll);
+      unr_insns = estimated_unrolled_size (&size, n_unroll);
       if (dump_file && (dump_flags & TDF_DETAILS))
 	{
 	  fprintf (dump_file, "  Loop size: %d\n", (int) ninsns);
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index 72ba04a09b8..3cdb9b35335 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -1276,7 +1276,7 @@ struct gimple_opt_pass pass_phiopt =
   NULL,					/* next */
   0,					/* static_pass_number */
   TV_TREE_PHIOPT,			/* tv_id */
-  PROP_cfg | PROP_ssa | PROP_alias,	/* properties_required */
+  PROP_cfg | PROP_ssa,			/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
@@ -1305,7 +1305,7 @@ struct gimple_opt_pass pass_cselim =
   NULL,					/* next */
   0,					/* static_pass_number */
   TV_TREE_PHIOPT,			/* tv_id */
-  PROP_cfg | PROP_ssa | PROP_alias,	/* properties_required */
+  PROP_cfg | PROP_ssa,			/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 3273c194981..592261420c1 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -4558,7 +4558,7 @@ struct gimple_opt_pass pass_pre =
   0,					/* static_pass_number */
   TV_TREE_PRE,				/* tv_id */
   PROP_no_crit_edges | PROP_cfg
-    | PROP_ssa | PROP_alias,		/* properties_required */
+    | PROP_ssa,				/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   TODO_rebuild_alias,			/* todo_flags_start */
@@ -4593,7 +4593,7 @@ struct gimple_opt_pass pass_fre =
   NULL,					/* next */
   0,					/* static_pass_number */
   TV_TREE_FRE,				/* tv_id */
-  PROP_cfg | PROP_ssa | PROP_alias,	/* properties_required */
+  PROP_cfg | PROP_ssa,			/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index a3e84680972..416409f1305 100644
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -2070,7 +2070,7 @@ struct gimple_opt_pass pass_reassoc =
   NULL,					/* next */
   0,					/* static_pass_number */
   TV_TREE_REASSOC,			/* tv_id */
-  PROP_cfg | PROP_ssa | PROP_alias,	/* properties_required */
+  PROP_cfg | PROP_ssa,			/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
diff --git a/gcc/tree-ssa-sink.c b/gcc/tree-ssa-sink.c
index d0c550d8abb..227ad11253c 100644
--- a/gcc/tree-ssa-sink.c
+++ b/gcc/tree-ssa-sink.c
@@ -570,7 +570,7 @@ struct gimple_opt_pass pass_sink_code =
   0,					/* static_pass_number */
   TV_TREE_SINK,				/* tv_id */
   PROP_no_crit_edges | PROP_cfg
-    | PROP_ssa | PROP_alias,		/* properties_required */
+    | PROP_ssa,				/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 3bcaeb1e011..eda053f2430 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -5753,7 +5753,7 @@ struct gimple_opt_pass pass_build_alias =
   0,                        /* static_pass_number */
   TV_NONE,                  /* tv_id */
   PROP_cfg | PROP_ssa,      /* properties_required */
-  PROP_alias,               /* properties_provided */
+  0,			    /* properties_provided */
   0,                        /* properties_destroyed */
   0,                        /* todo_flags_start */
   TODO_rebuild_alias | TODO_dump_func  /* todo_flags_finish */
diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c
index f9a2110095c..4e030b12fa9 100644
--- a/gcc/tree-stdarg.c
+++ b/gcc/tree-stdarg.c
@@ -906,7 +906,7 @@ struct gimple_opt_pass pass_stdarg =
   NULL,					/* next */
   0,					/* static_pass_number */
   TV_NONE,				/* tv_id */
-  PROP_cfg | PROP_ssa | PROP_alias,	/* properties_required */
+  PROP_cfg | PROP_ssa,			/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index 6b03eaaac89..23d849f268e 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -1019,7 +1019,7 @@ struct gimple_opt_pass pass_tail_calls =
   NULL,					/* next */
   0,					/* static_pass_number */
   TV_NONE,				/* tv_id */
-  PROP_cfg | PROP_ssa | PROP_alias,	/* properties_required */
+  PROP_cfg | PROP_ssa,			/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index a117898e146..443ecd04088 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -1428,7 +1428,7 @@ vect_analyze_group_access (struct data_reference *dr)
       tree next_step;
       tree prev_init = DR_INIT (data_ref);
       gimple prev = stmt;
-      HOST_WIDE_INT diff, count_in_bytes;
+      HOST_WIDE_INT diff, count_in_bytes, gaps = 0;
 
       while (next)
         {
@@ -1490,6 +1490,8 @@ vect_analyze_group_access (struct data_reference *dr)
 		    fprintf (vect_dump, "interleaved store with gaps");
 		  return false;
 		}
+
+              gaps += diff - 1;
 	    }
 
           /* Store the gap from the previous member of the group. If there is no
@@ -1506,8 +1508,9 @@ vect_analyze_group_access (struct data_reference *dr)
          the type to get COUNT_IN_BYTES.  */
       count_in_bytes = type_size * count;
 
-      /* Check that the size of the interleaving is not greater than STEP.  */
-      if (dr_step < count_in_bytes)
+     /* Check that the size of the interleaving (including gaps) is not greater
+         than STEP.  */
+      if (dr_step && dr_step < count_in_bytes + gaps * type_size)
         {
           if (vect_print_dump_info (REPORT_DETAILS))
             {
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 09c634246ec..3a86b826e50 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -7347,7 +7347,7 @@ struct gimple_opt_pass pass_vrp =
   NULL,					/* next */
   0,					/* static_pass_number */
   TV_TREE_VRP,				/* tv_id */
-  PROP_ssa | PROP_alias,		/* properties_required */
+  PROP_ssa,				/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
diff --git a/gcc/tree.c b/gcc/tree.c
index 295358c527b..876f43a6334 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -3626,24 +3626,6 @@ iterative_hash_hashval_t (hashval_t val, hashval_t val2)
   return val2;
 }
 
-/* Produce good hash value combining PTR and VAL2.  */
-static inline hashval_t
-iterative_hash_pointer (const void *ptr, hashval_t val2)
-{
-  if (sizeof (ptr) == sizeof (hashval_t))
-    return iterative_hash_hashval_t ((size_t) ptr, val2);
-  else
-    {
-      hashval_t a = (hashval_t) (size_t) ptr;
-      /* Avoid warnings about shifting of more than the width of the type on
-         hosts that won't execute this path.  */
-      int zero = 0;
-      hashval_t b = (hashval_t) ((size_t) ptr >> (sizeof (hashval_t) * 8 + zero));
-      mix (a, b, val2);
-      return val2;
-    }
-}
-
 /* Produce good hash value combining VAL and VAL2.  */
 static inline hashval_t
 iterative_hash_host_wide_int (HOST_WIDE_INT val, hashval_t val2)
@@ -5330,7 +5312,7 @@ iterative_hash_expr (const_tree t, hashval_t val)
   char tclass;
 
   if (t == NULL_TREE)
-    return iterative_hash_pointer (t, val);
+    return iterative_hash_hashval_t (0, val);
 
   code = TREE_CODE (t);
 
@@ -5364,7 +5346,7 @@ iterative_hash_expr (const_tree t, hashval_t val)
 
     case SSA_NAME:
       /* we can just compare by pointer.  */
-      return iterative_hash_pointer (t, val);
+      return iterative_hash_host_wide_int (SSA_NAME_VERSION (t), val);
 
     case TREE_LIST:
       /* A list of expressions, for a CALL_EXPR or as the elements of a
@@ -5388,13 +5370,12 @@ iterative_hash_expr (const_tree t, hashval_t val)
 	 __builtin__ form.  Otherwise nodes that compare equal
 	 according to operand_equal_p might get different
 	 hash codes.  */
-      if (DECL_BUILT_IN (t))
+      if (DECL_BUILT_IN (t) && built_in_decls[DECL_FUNCTION_CODE (t)])
 	{
-	  val = iterative_hash_pointer (built_in_decls[DECL_FUNCTION_CODE (t)], 
-				      val);
-	  return val;
+	  t = built_in_decls[DECL_FUNCTION_CODE (t)];
+	  code = TREE_CODE (t);
 	}
-      /* else FALL THROUGH */
+      /* FALL THROUGH */
     default:
       tclass = TREE_CODE_CLASS (code);
 
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cb57e6f71eb..024e0181923 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.ac: Insert libgcjdir in the GCJ passed in the
+	environment, rather than overriding completely.
+	* configure: Rebuilt.
+
 2009-04-28  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* testsuite/libjava.jvmti/jvmti-interp.exp
diff --git a/libjava/configure b/libjava/configure
index b2c24670474..8fa8ed3616d 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -5469,23 +5469,33 @@ else
      which_gcj=path
   fi
 fi
+libgcjdir=`${PWDCMD-pwd}`
+case $GCJ in
+*" -B"*)
+  # Just in case there is a comma in the build dir, quote it for the
+  # sed command below.
+  case $libgcjdir in
+  *[,\\]*) qlibgcjdir=`echo "$libgcjdir" | sed 's:[,\\]:\\&:g'`;;
+  *) qlibgcjdir=$libgcjdir;;
+  esac
+  GCJ=`echo "$GCJ" | sed "s, -B, -B$qlibgcjdir/&,"`
+  ;;
+*)
+  GCJ=$GCJ" -B$libgcjdir/"
+  ;;
+esac
 case "${which_gcj}" in
    built)
-      GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
       GCJH='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
    ;;
    cross)
       if test "x${with_newlib}" = "xyes"; then
          # FIXME (comment): Why is this needed?
          GCC_UNWIND_INCLUDE=
-         GCJ="${target_noncanonical}-gcj"
-      else
-         GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
       fi
       GCJH='$(target_noncanonical)-gcjh'
    ;;
    path)
-      GCJ="gcj -B`${PWDCMD-pwd}`/"
       GCJH=gcjh
    ;;
 esac
@@ -6003,13 +6013,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6006: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6016: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6009: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6019: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6012: output\"" >&5)
+  (eval echo "\"\$as_me:6022: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7156,7 +7166,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7159 "configure"' > conftest.$ac_ext
+  echo '#line 7169 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9539,11 +9549,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9542: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9552: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9546: \$? = $ac_status" >&5
+   echo "$as_me:9556: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9878,11 +9888,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9881: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9891: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9885: \$? = $ac_status" >&5
+   echo "$as_me:9895: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9983,11 +9993,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9986: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9996: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9990: \$? = $ac_status" >&5
+   echo "$as_me:10000: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10038,11 +10048,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10041: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10051: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10045: \$? = $ac_status" >&5
+   echo "$as_me:10055: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12905,7 +12915,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12908 "configure"
+#line 12918 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13001,7 +13011,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13004 "configure"
+#line 13014 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15027,11 +15037,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15030: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15040: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15034: \$? = $ac_status" >&5
+   echo "$as_me:15044: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15126,11 +15136,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15129: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15139: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15133: \$? = $ac_status" >&5
+   echo "$as_me:15143: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15178,11 +15188,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15181: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15191: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15185: \$? = $ac_status" >&5
+   echo "$as_me:15195: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16595,11 +16605,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16598: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16608: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16602: \$? = $ac_status" >&5
+   echo "$as_me:16612: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16928,11 +16938,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16931: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16941: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16935: \$? = $ac_status" >&5
+   echo "$as_me:16945: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17027,11 +17037,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17030: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17040: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17034: \$? = $ac_status" >&5
+   echo "$as_me:17044: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17079,11 +17089,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17082: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17092: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17086: \$? = $ac_status" >&5
+   echo "$as_me:17096: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18775,7 +18785,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
   :
 else
   cat > conftest.$ac_ext << EOF
-#line 18778 "configure"
+#line 18788 "configure"
 struct S { ~S(); };
 void bar();
 void foo()
@@ -29106,6 +29116,9 @@ ac_configure_args="${multilib_arg} ${ac_configure_args}"
 multi_basedir="$multi_basedir"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 CC="$CC"
+CXX="$CXX"
+GFORTRAN="$GFORTRAN"
+GCJ="$GCJ"
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 
diff --git a/libjava/configure.ac b/libjava/configure.ac
index c57356a8cde..3074a0c0fd4 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -409,23 +409,33 @@ else
      which_gcj=path
   fi
 fi
+libgcjdir=`${PWDCMD-pwd}`
+case $GCJ in
+*" -B"*)
+  # Just in case there is a comma in the build dir, quote it for the
+  # sed command below.
+  case $libgcjdir in
+  *[[,\\]]*) qlibgcjdir=`echo "$libgcjdir" | sed 's:[[,\\]]:\\&:g'`;;
+  *) qlibgcjdir=$libgcjdir;;
+  esac
+  GCJ=`echo "$GCJ" | sed "s, -B, -B$qlibgcjdir/&,"`
+  ;;
+*)
+  GCJ=$GCJ" -B$libgcjdir/"
+  ;;
+esac
 case "${which_gcj}" in
    built)
-      GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
       GCJH='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
    ;;
    cross)
       if test "x${with_newlib}" = "xyes"; then
          # FIXME (comment): Why is this needed?
          GCC_UNWIND_INCLUDE=
-         GCJ="${target_noncanonical}-gcj"
-      else
-         GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
       fi
       GCJH='$(target_noncanonical)-gcjh'
    ;;
    path)
-      GCJ="gcj -B`${PWDCMD-pwd}`/"
       GCJH=gcjh
    ;;
 esac