OSDN Git Service

ChangeLog:
authoraoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 12 May 2009 05:49:28 +0000 (05:49 +0000)
committeraoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 12 May 2009 05:49:28 +0000 (05:49 +0000)
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.
config/ChangeLog:
* 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.
gcc/ChangeLog:
PR target/37137
* doc/install.texi (STAGE1_TFLAGS, BUILD_CONFIG): Document.
gcc/java/ChangeLog:
* Make-lang.in (GCJ): Renamed to...
(XGCJ): ... this.
libjava/ChangeLog:
* configure.ac: Insert libgcjdir in the GCJ passed in the
environment, rather than overriding completely.
* configure: Rebuilt.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@147415 138bc75d-0d04-0410-961f-82ee72b054a4

17 files changed:
ChangeLog
Makefile.def
Makefile.in
Makefile.tpl
config/ChangeLog
config/bootstrap-O1.mk [new file with mode: 0644]
config/bootstrap-O3.mk [new file with mode: 0644]
config/bootstrap-debug.mk [new file with mode: 0644]
config/mt-gnu
config/multi.m4
gcc/ChangeLog
gcc/doc/install.texi
gcc/java/ChangeLog
gcc/java/Make-lang.in
libjava/ChangeLog
libjava/configure
libjava/configure.ac

index 39ad00f..9a4630e 100644 (file)
--- 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.
index ceee555..86cf758 100644 (file)
@@ -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 ; };
index 238ed68..d969c6d 100644 (file)
@@ -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)"; \
    &nb