* decl.c (cxx_maybe_build_cleanup): When clearing location of cleanup,

[thirdparty/gcc.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4f5bbf75c98e5549cdcb45b0f735dd339ab38e03..86c0c6d5b2d2cf16f203ac5c39ec272f74d5b803 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -156,6 +156,8 @@ BUILD_EXPORTS = \
        GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
        GOC="$(GOC_FOR_BUILD)"; export GOC; \
        GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
+       GDC="$(GDC_FOR_BUILD)"; export GDC; \
+       GDCFLAGS="$(GDCFLAGS_FOR_BUILD)"; export GDCFLAGS; \
        DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
        LD="$(LD_FOR_BUILD)"; export LD; \
        LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
@@ -192,9 +194,11 @@ HOST_EXPORTS = \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
        GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
        GOC="$(GOC)"; export GOC; \
+       GDC="$(GDC)"; export GDC; \
        AR="$(AR)"; export AR; \
        AS="$(AS)"; export AS; \
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
+       CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
        LDFLAGS="$(STAGE1_LDFLAGS) $(LDFLAGS)"; export LDFLAGS; \
@@ -204,6 +208,7 @@ HOST_EXPORTS = \
        WINDMC="$(WINDMC)"; export WINDMC; \
        OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
        OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       OTOOL="$(OTOOL)"; export OTOOL; \
        READELF="$(READELF)"; export READELF; \
        AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
        AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
@@ -212,6 +217,7 @@ HOST_EXPORTS = \
        NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
        OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
        OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY_FOR_TARGET; \
+       OTOOL_FOR_TARGET="$(OTOOL_FOR_TARGET)"; export OTOOL_FOR_TARGET; \
        RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
        READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
        TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
@@ -256,6 +262,14 @@ POSTSTAGE1_HOST_EXPORTS = \
        CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \
        $(POSTSTAGE1_CXX_EXPORT) \
        $(LTO_EXPORTS) \
+       GDC="$$r/$(HOST_SUBDIR)/prev-gcc/gdc$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
+         -B$(build_tooldir)/bin/ $(GDC_FLAGS_FOR_TARGET) \
+         -B$$r/prev-$(TARGET_SUBDIR)/libphobos/src \
+         -I$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime -I$$s/libphobos/libdruntime \
+         -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs \
+         -L$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/.libs"; \
+       export GDC; \
+       GDC_FOR_BUILD="$$GDC"; export GDC_FOR_BUILD; \
        GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
        LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \
        HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS;
@@ -278,6 +292,7 @@ BASE_TARGET_EXPORTS = \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
        GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
+       GDC="$(GDC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GDC; \
        DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
        LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
        LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
@@ -285,6 +300,7 @@ BASE_TARGET_EXPORTS = \
        NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
        OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
        OBJCOPY="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY; \
+       OTOOL="$(OTOOL_FOR_TARGET)"; export OTOOL; \
        RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
        READELF="$(READELF_FOR_TARGET)"; export READELF; \
        STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
@@ -342,6 +358,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@
 DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
 GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
 GOC_FOR_BUILD = @GOC_FOR_BUILD@
+GDC_FOR_BUILD = @GDC_FOR_BUILD@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
 LD_FOR_BUILD = @LD_FOR_BUILD@
 NM_FOR_BUILD = @NM_FOR_BUILD@
@@ -371,7 +388,7 @@ MAKEINFO = @MAKEINFO@
 EXPECT = @EXPECT@
 RUNTEST = @RUNTEST@
 
-AUTO_PROFILE = gcc-auto-profile -c 1000000
+AUTO_PROFILE = gcc-auto-profile -c 10000000
 
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still
@@ -393,12 +410,14 @@ LD = @LD@
 LIPO = @LIPO@
 NM = @NM@
 OBJDUMP = @OBJDUMP@
+OTOOL = @OTOOL@
 RANLIB = @RANLIB@
 READELF = @READELF@
 STRIP = @STRIP@
 WINDRES = @WINDRES@
 WINDMC = @WINDMC@
 
+GDC = @GDC@
 GNATBIND = @GNATBIND@
 GNATMAKE = @GNATMAKE@
 
@@ -408,6 +427,7 @@ LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 GOCFLAGS = $(CFLAGS)
+GDCFLAGS = $(CFLAGS)
 
 CREATE_GCOV = create_gcov
 
@@ -536,14 +556,14 @@ STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
 STAGE1_TFLAGS += -fno-checking
 STAGE2_CFLAGS += -fno-checking
 STAGE2_TFLAGS += -fno-checking
-STAGE3_CFLAGS += -fchecking
-STAGE3_TFLAGS += -fchecking
+STAGE3_CFLAGS += -fchecking=1
+STAGE3_TFLAGS += -fchecking=1
 
 STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
 STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
 
-STAGEtrain_CFLAGS = $(filter-out -fchecking,$(STAGE3_CFLAGS))
-STAGEtrain_TFLAGS = $(filter-out -fchecking,$(STAGE3_TFLAGS))
+STAGEtrain_CFLAGS = $(filter-out -fchecking=1,$(STAGE3_CFLAGS))
+STAGEtrain_TFLAGS = $(filter-out -fchecking=1,$(STAGE3_TFLAGS))
 
 STAGEfeedback_CFLAGS = $(STAGE4_CFLAGS) -fprofile-use
 STAGEfeedback_TFLAGS = $(STAGE4_TFLAGS)
@@ -574,6 +594,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@
 RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
 GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
 GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
+GDC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GDC_FOR_TARGET@
 DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
 LD_FOR_TARGET=@LD_FOR_TARGET@
 
@@ -581,6 +602,7 @@ LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
 NM_FOR_TARGET=@NM_FOR_TARGET@
 OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
 OBJCOPY_FOR_TARGET=@OBJCOPY_FOR_TARGET@
+OTOOL_FOR_TARGET=@OTOOL_FOR_TARGET@
 RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
 READELF_FOR_TARGET=@READELF_FOR_TARGET@
 STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
@@ -598,6 +620,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
 GOCFLAGS_FOR_TARGET = -O2 -g
+GDCFLAGS_FOR_TARGET = -O2 -g
 
 FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
 SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
@@ -622,7 +645,7 @@ all:
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that programs built for the target machine work.
-TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libmpx)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
+TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libphobos)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
 
 @if target-libstdc++-v3
 TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
@@ -632,10 +655,6 @@ TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
 TARGET_LIB_PATH_libsanitizer = $$r/$(TARGET_SUBDIR)/libsanitizer/.libs:
 @endif target-libsanitizer
 
-@if target-libmpx
-TARGET_LIB_PATH_libmpx = $$r/$(TARGET_SUBDIR)/libmpx/.libs:
-@endif target-libmpx
-
 @if target-libvtv
 TARGET_LIB_PATH_libvtv = $$r/$(TARGET_SUBDIR)/libvtv/.libs:
 @endif target-libvtv
@@ -648,6 +667,10 @@ TARGET_LIB_PATH_liboffloadmic = $$r/$(TARGET_SUBDIR)/liboffloadmic/.libs:
 TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
 @endif target-libssp
 
+@if target-libphobos
+TARGET_LIB_PATH_libphobos = $$r/$(TARGET_SUBDIR)/libphobos/src/.libs:
+@endif target-libphobos
+
 @if target-libgomp
 TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs:
 @endif target-libgomp
@@ -782,6 +805,8 @@ BASE_FLAGS_TO_PASS = \
        "STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \
        "GNATBIND=$(GNATBIND)" \
        "GNATMAKE=$(GNATMAKE)" \
+       "GDC=$(GDC)" \
+       "GDCFLAGS=$(GDCFLAGS)" \
        "AR_FOR_TARGET=$(AR_FOR_TARGET)" \
        "AS_FOR_TARGET=$(AS_FOR_TARGET)" \
        "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
@@ -793,6 +818,8 @@ BASE_FLAGS_TO_PASS = \
        "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
        "GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
        "GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \
+       "GDC_FOR_TARGET=$(GDC_FOR_TARGET)" \
+       "GDCFLAGS_FOR_TARGET=$(GDCFLAGS_FOR_TARGET)" \
        "LD_FOR_TARGET=$(LD_FOR_TARGET)" \
        "LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
        "LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
@@ -811,30 +838,39 @@ BASE_FLAGS_TO_PASS = \
        "LEAN=$(LEAN)" \
        "STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \
        "STAGE1_CXXFLAGS=$(STAGE1_CXXFLAGS)" \
+       "STAGE1_GENERATOR_CFLAGS=$(STAGE1_GENERATOR_CFLAGS)" \
        "STAGE1_TFLAGS=$(STAGE1_TFLAGS)" \
        "STAGE2_CFLAGS=$(STAGE2_CFLAGS)" \
        "STAGE2_CXXFLAGS=$(STAGE2_CXXFLAGS)" \
+       "STAGE2_GENERATOR_CFLAGS=$(STAGE2_GENERATOR_CFLAGS)" \
        "STAGE2_TFLAGS=$(STAGE2_TFLAGS)" \
        "STAGE3_CFLAGS=$(STAGE3_CFLAGS)" \
        "STAGE3_CXXFLAGS=$(STAGE3_CXXFLAGS)" \
+       "STAGE3_GENERATOR_CFLAGS=$(STAGE3_GENERATOR_CFLAGS)" \
        "STAGE3_TFLAGS=$(STAGE3_TFLAGS)" \
        "STAGE4_CFLAGS=$(STAGE4_CFLAGS)" \
        "STAGE4_CXXFLAGS=$(STAGE4_CXXFLAGS)" \
+       "STAGE4_GENERATOR_CFLAGS=$(STAGE4_GENERATOR_CFLAGS)" \
        "STAGE4_TFLAGS=$(STAGE4_TFLAGS)" \
        "STAGEprofile_CFLAGS=$(STAGEprofile_CFLAGS)" \
        "STAGEprofile_CXXFLAGS=$(STAGEprofile_CXXFLAGS)" \
+       "STAGEprofile_GENERATOR_CFLAGS=$(STAGEprofile_GENERATOR_CFLAGS)" \
        "STAGEprofile_TFLAGS=$(STAGEprofile_TFLAGS)" \
        "STAGEtrain_CFLAGS=$(STAGEtrain_CFLAGS)" \
        "STAGEtrain_CXXFLAGS=$(STAGEtrain_CXXFLAGS)" \
+       "STAGEtrain_GENERATOR_CFLAGS=$(STAGEtrain_GENERATOR_CFLAGS)" \
        "STAGEtrain_TFLAGS=$(STAGEtrain_TFLAGS)" \
        "STAGEfeedback_CFLAGS=$(STAGEfeedback_CFLAGS)" \
        "STAGEfeedback_CXXFLAGS=$(STAGEfeedback_CXXFLAGS)" \
+       "STAGEfeedback_GENERATOR_CFLAGS=$(STAGEfeedback_GENERATOR_CFLAGS)" \
        "STAGEfeedback_TFLAGS=$(STAGEfeedback_TFLAGS)" \
        "STAGEautoprofile_CFLAGS=$(STAGEautoprofile_CFLAGS)" \
        "STAGEautoprofile_CXXFLAGS=$(STAGEautoprofile_CXXFLAGS)" \
+       "STAGEautoprofile_GENERATOR_CFLAGS=$(STAGEautoprofile_GENERATOR_CFLAGS)" \
        "STAGEautoprofile_TFLAGS=$(STAGEautoprofile_TFLAGS)" \
        "STAGEautofeedback_CFLAGS=$(STAGEautofeedback_CFLAGS)" \
        "STAGEautofeedback_CXXFLAGS=$(STAGEautofeedback_CXXFLAGS)" \
+       "STAGEautofeedback_GENERATOR_CFLAGS=$(STAGEautofeedback_GENERATOR_CFLAGS)" \
        "STAGEautofeedback_TFLAGS=$(STAGEautofeedback_TFLAGS)" \
        $(CXX_FOR_TARGET_FLAG_TO_PASS) \
        "TFLAGS=$(TFLAGS)" \
@@ -855,10 +891,12 @@ EXTRA_HOST_FLAGS = \
        'DLLTOOL=$(DLLTOOL)' \
        'GFORTRAN=$(GFORTRAN)' \
        'GOC=$(GOC)' \
+       'GDC=$(GDC)' \
        'LD=$(LD)' \
        'LIPO=$(LIPO)' \
        'NM=$(NM)' \
        'OBJDUMP=$(OBJDUMP)' \
+       'OTOOL=$(OTOOL)' \
        'RANLIB=$(RANLIB)' \
        'READELF=$(READELF)' \
        'STRIP=$(STRIP)' \
@@ -879,6 +917,7 @@ STAGE1_FLAGS_TO_PASS = \
 POSTSTAGE1_FLAGS_TO_PASS = \
        CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
        CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \
+       GDC="$${GDC}" GDC_FOR_BUILD="$${GDC_FOR_BUILD}" \
        GNATBIND="$${GNATBIND}" \
        LDFLAGS="$${LDFLAGS}" \
        HOST_LIBS="$${HOST_LIBS}" \
@@ -911,6 +950,8 @@ EXTRA_TARGET_FLAGS = \
        'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
        'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
        'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
+       'GDC=$$(GDC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+       'GDCFLAGS=$$(GDCFLAGS_FOR_TARGET)' \
        'LD=$(COMPILER_LD_FOR_TARGET)' \
        'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
        'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
@@ -987,6 +1028,7 @@ configure-host:  \
     maybe-configure-sim \
     maybe-configure-texinfo \
     maybe-configure-zlib \
+    maybe-configure-gnulib \
     maybe-configure-gdb \
     maybe-configure-expect \
     maybe-configure-guile \
@@ -996,12 +1038,12 @@ configure-host:  \
     maybe-configure-gnattools \
     maybe-configure-lto-plugin \
     maybe-configure-libcc1 \
-    maybe-configure-gotools
+    maybe-configure-gotools \
+    maybe-configure-libctf
 .PHONY: configure-target
 configure-target:  \
     maybe-configure-target-libstdc++-v3 \
     maybe-configure-target-libsanitizer \
-    maybe-configure-target-libmpx \
     maybe-configure-target-libvtv \
     maybe-configure-target-liboffloadmic \
     maybe-configure-target-libssp \
@@ -1013,6 +1055,7 @@ configure-target:  \
     maybe-configure-target-libobjc \
     maybe-configure-target-libgo \
     maybe-configure-target-libhsail-rt \
+    maybe-configure-target-libphobos \
     maybe-configure-target-libtermcap \
     maybe-configure-target-winsup \
     maybe-configure-target-libgloss \
@@ -1139,6 +1182,7 @@ all-host: maybe-all-texinfo
 @if zlib-no-bootstrap
 all-host: maybe-all-zlib
 @endif zlib-no-bootstrap
+all-host: maybe-all-gnulib
 all-host: maybe-all-gdb
 all-host: maybe-all-expect
 all-host: maybe-all-guile
@@ -1151,6 +1195,9 @@ all-host: maybe-all-lto-plugin
 @endif lto-plugin-no-bootstrap
 all-host: maybe-all-libcc1
 all-host: maybe-all-gotools
+@if libctf-no-bootstrap
+all-host: maybe-all-libctf
+@endif libctf-no-bootstrap
 
 .PHONY: all-target
 
@@ -1160,9 +1207,6 @@ all-target: maybe-all-target-libstdc++-v3
 @if target-libsanitizer-no-bootstrap
 all-target: maybe-all-target-libsanitizer
 @endif target-libsanitizer-no-bootstrap
-@if target-libmpx-no-bootstrap
-all-target: maybe-all-target-libmpx
-@endif target-libmpx-no-bootstrap
 @if target-libvtv-no-bootstrap
 all-target: maybe-all-target-libvtv
 @endif target-libvtv-no-bootstrap
@@ -1178,6 +1222,7 @@ all-target: maybe-all-target-libgfortran
 all-target: maybe-all-target-libobjc
 all-target: maybe-all-target-libgo
 all-target: maybe-all-target-libhsail-rt
+all-target: maybe-all-target-libphobos
 all-target: maybe-all-target-libtermcap
 all-target: maybe-all-target-winsup
 all-target: maybe-all-target-libgloss
@@ -1243,6 +1288,7 @@ info-host: maybe-info-sid
 info-host: maybe-info-sim
 info-host: maybe-info-texinfo
 info-host: maybe-info-zlib
+info-host: maybe-info-gnulib
 info-host: maybe-info-gdb
 info-host: maybe-info-expect
 info-host: maybe-info-guile
@@ -1253,12 +1299,12 @@ info-host: maybe-info-gnattools
 info-host: maybe-info-lto-plugin
 info-host: maybe-info-libcc1
 info-host: maybe-info-gotools
+info-host: maybe-info-libctf
 
 .PHONY: info-target
 
 info-target: maybe-info-target-libstdc++-v3
 info-target: maybe-info-target-libsanitizer
-info-target: maybe-info-target-libmpx
 info-target: maybe-info-target-libvtv
 info-target: maybe-info-target-liboffloadmic
 info-target: maybe-info-target-libssp
@@ -1270,6 +1316,7 @@ info-target: maybe-info-target-libgfortran
 info-target: maybe-info-target-libobjc
 info-target: maybe-info-target-libgo
 info-target: maybe-info-target-libhsail-rt
+info-target: maybe-info-target-libphobos
 info-target: maybe-info-target-libtermcap
 info-target: maybe-info-target-winsup
 info-target: maybe-info-target-libgloss
@@ -1328,6 +1375,7 @@ dvi-host: maybe-dvi-sid
 dvi-host: maybe-dvi-sim
 dvi-host: maybe-dvi-texinfo
 dvi-host: maybe-dvi-zlib
+dvi-host: maybe-dvi-gnulib
 dvi-host: maybe-dvi-gdb
 dvi-host: maybe-dvi-expect
 dvi-host: maybe-dvi-guile
@@ -1338,12 +1386,12 @@ dvi-host: maybe-dvi-gnattools
 dvi-host: maybe-dvi-lto-plugin
 dvi-host: maybe-dvi-libcc1
 dvi-host: maybe-dvi-gotools
+dvi-host: maybe-dvi-libctf
 
 .PHONY: dvi-target
 
 dvi-target: maybe-dvi-target-libstdc++-v3
 dvi-target: maybe-dvi-target-libsanitizer
-dvi-target: maybe-dvi-target-libmpx
 dvi-target: maybe-dvi-target-libvtv
 dvi-target: maybe-dvi-target-liboffloadmic
 dvi-target: maybe-dvi-target-libssp
@@ -1355,6 +1403,7 @@ dvi-target: maybe-dvi-target-libgfortran
 dvi-target: maybe-dvi-target-libobjc
 dvi-target: maybe-dvi-target-libgo
 dvi-target: maybe-dvi-target-libhsail-rt
+dvi-target: maybe-dvi-target-libphobos
 dvi-target: maybe-dvi-target-libtermcap
 dvi-target: maybe-dvi-target-winsup
 dvi-target: maybe-dvi-target-libgloss
@@ -1413,6 +1462,7 @@ pdf-host: maybe-pdf-sid
 pdf-host: maybe-pdf-sim
 pdf-host: maybe-pdf-texinfo
 pdf-host: maybe-pdf-zlib
+pdf-host: maybe-pdf-gnulib
 pdf-host: maybe-pdf-gdb
 pdf-host: maybe-pdf-expect
 pdf-host: maybe-pdf-guile
@@ -1423,12 +1473,12 @@ pdf-host: maybe-pdf-gnattools
 pdf-host: maybe-pdf-lto-plugin
 pdf-host: maybe-pdf-libcc1
 pdf-host: maybe-pdf-gotools
+pdf-host: maybe-pdf-libctf
 
 .PHONY: pdf-target
 
 pdf-target: maybe-pdf-target-libstdc++-v3
 pdf-target: maybe-pdf-target-libsanitizer
-pdf-target: maybe-pdf-target-libmpx
 pdf-target: maybe-pdf-target-libvtv
 pdf-target: maybe-pdf-target-liboffloadmic
 pdf-target: maybe-pdf-target-libssp
@@ -1440,6 +1490,7 @@ pdf-target: maybe-pdf-target-libgfortran
 pdf-target: maybe-pdf-target-libobjc
 pdf-target: maybe-pdf-target-libgo
 pdf-target: maybe-pdf-target-libhsail-rt
+pdf-target: maybe-pdf-target-libphobos
 pdf-target: maybe-pdf-target-libtermcap
 pdf-target: maybe-pdf-target-winsup
 pdf-target: maybe-pdf-target-libgloss
@@ -1498,6 +1549,7 @@ html-host: maybe-html-sid
 html-host: maybe-html-sim
 html-host: maybe-html-texinfo
 html-host: maybe-html-zlib
+html-host: maybe-html-gnulib
 html-host: maybe-html-gdb
 html-host: maybe-html-expect
 html-host: maybe-html-guile
@@ -1508,12 +1560,12 @@ html-host: maybe-html-gnattools
 html-host: maybe-html-lto-plugin
 html-host: maybe-html-libcc1
 html-host: maybe-html-gotools
+html-host: maybe-html-libctf
 
 .PHONY: html-target
 
 html-target: maybe-html-target-libstdc++-v3
 html-target: maybe-html-target-libsanitizer
-html-target: maybe-html-target-libmpx
 html-target: maybe-html-target-libvtv
 html-target: maybe-html-target-liboffloadmic
 html-target: maybe-html-target-libssp
@@ -1525,6 +1577,7 @@ html-target: maybe-html-target-libgfortran
 html-target: maybe-html-target-libobjc
 html-target: maybe-html-target-libgo
 html-target: maybe-html-target-libhsail-rt
+html-target: maybe-html-target-libphobos
 html-target: maybe-html-target-libtermcap
 html-target: maybe-html-target-winsup
 html-target: maybe-html-target-libgloss
@@ -1583,6 +1636,7 @@ TAGS-host: maybe-TAGS-sid
 TAGS-host: maybe-TAGS-sim
 TAGS-host: maybe-TAGS-texinfo
 TAGS-host: maybe-TAGS-zlib
+TAGS-host: maybe-TAGS-gnulib
 TAGS-host: maybe-TAGS-gdb
 TAGS-host: maybe-TAGS-expect
 TAGS-host: maybe-TAGS-guile
@@ -1593,12 +1647,12 @@ TAGS-host: maybe-TAGS-gnattools
 TAGS-host: maybe-TAGS-lto-plugin
 TAGS-host: maybe-TAGS-libcc1
 TAGS-host: maybe-TAGS-gotools
+TAGS-host: maybe-TAGS-libctf
 
 .PHONY: TAGS-target
 
 TAGS-target: maybe-TAGS-target-libstdc++-v3
 TAGS-target: maybe-TAGS-target-libsanitizer
-TAGS-target: maybe-TAGS-target-libmpx
 TAGS-target: maybe-TAGS-target-libvtv
 TAGS-target: maybe-TAGS-target-liboffloadmic
 TAGS-target: maybe-TAGS-target-libssp
@@ -1610,6 +1664,7 @@ TAGS-target: maybe-TAGS-target-libgfortran
 TAGS-target: maybe-TAGS-target-libobjc
 TAGS-target: maybe-TAGS-target-libgo
 TAGS-target: maybe-TAGS-target-libhsail-rt
+TAGS-target: maybe-TAGS-target-libphobos
 TAGS-target: maybe-TAGS-target-libtermcap
 TAGS-target: maybe-TAGS-target-winsup
 TAGS-target: maybe-TAGS-target-libgloss
@@ -1668,6 +1723,7 @@ install-info-host: maybe-install-info-sid
 install-info-host: maybe-install-info-sim
 install-info-host: maybe-install-info-texinfo
 install-info-host: maybe-install-info-zlib
+install-info-host: maybe-install-info-gnulib
 install-info-host: maybe-install-info-gdb
 install-info-host: maybe-install-info-expect
 install-info-host: maybe-install-info-guile
@@ -1678,12 +1734,12 @@ install-info-host: maybe-install-info-gnattools
 install-info-host: maybe-install-info-lto-plugin
 install-info-host: maybe-install-info-libcc1
 install-info-host: maybe-install-info-gotools
+install-info-host: maybe-install-info-libctf
 
 .PHONY: install-info-target
 
 install-info-target: maybe-install-info-target-libstdc++-v3
 install-info-target: maybe-install-info-target-libsanitizer
-install-info-target: maybe-install-info-target-libmpx
 install-info-target: maybe-install-info-target-libvtv
 install-info-target: maybe-install-info-target-liboffloadmic
 install-info-target: maybe-install-info-target-libssp
@@ -1695,6 +1751,7 @@ install-info-target: maybe-install-info-target-libgfortran
 install-info-target: maybe-install-info-target-libobjc
 install-info-target: maybe-install-info-target-libgo
 install-info-target: maybe-install-info-target-libhsail-rt
+install-info-target: maybe-install-info-target-libphobos
 install-info-target: maybe-install-info-target-libtermcap
 install-info-target: maybe-install-info-target-winsup
 install-info-target: maybe-install-info-target-libgloss
@@ -1753,6 +1810,7 @@ install-pdf-host: maybe-install-pdf-sid
 install-pdf-host: maybe-install-pdf-sim
 install-pdf-host: maybe-install-pdf-texinfo
 install-pdf-host: maybe-install-pdf-zlib
+install-pdf-host: maybe-install-pdf-gnulib
 install-pdf-host: maybe-install-pdf-gdb
 install-pdf-host: maybe-install-pdf-expect
 install-pdf-host: maybe-install-pdf-guile
@@ -1763,12 +1821,12 @@ install-pdf-host: maybe-install-pdf-gnattools
 install-pdf-host: maybe-install-pdf-lto-plugin
 install-pdf-host: maybe-install-pdf-libcc1
 install-pdf-host: maybe-install-pdf-gotools
+install-pdf-host: maybe-install-pdf-libctf
 
 .PHONY: install-pdf-target
 
 install-pdf-target: maybe-install-pdf-target-libstdc++-v3
 install-pdf-target: maybe-install-pdf-target-libsanitizer
-install-pdf-target: maybe-install-pdf-target-libmpx
 install-pdf-target: maybe-install-pdf-target-libvtv
 install-pdf-target: maybe-install-pdf-target-liboffloadmic
 install-pdf-target: maybe-install-pdf-target-libssp
@@ -1780,6 +1838,7 @@ install-pdf-target: maybe-install-pdf-target-libgfortran
 install-pdf-target: maybe-install-pdf-target-libobjc
 install-pdf-target: maybe-install-pdf-target-libgo
 install-pdf-target: maybe-install-pdf-target-libhsail-rt
+install-pdf-target: maybe-install-pdf-target-libphobos
 install-pdf-target: maybe-install-pdf-target-libtermcap
 install-pdf-target: maybe-install-pdf-target-winsup
 install-pdf-target: maybe-install-pdf-target-libgloss
@@ -1838,6 +1897,7 @@ install-html-host: maybe-install-html-sid
 install-html-host: maybe-install-html-sim
 install-html-host: maybe-install-html-texinfo
 install-html-host: maybe-install-html-zlib
+install-html-host: maybe-install-html-gnulib
 install-html-host: maybe-install-html-gdb
 install-html-host: maybe-install-html-expect
 install-html-host: maybe-install-html-guile
@@ -1848,12 +1908,12 @@ install-html-host: maybe-install-html-gnattools
 install-html-host: maybe-install-html-lto-plugin
 install-html-host: maybe-install-html-libcc1
 install-html-host: maybe-install-html-gotools
+install-html-host: maybe-install-html-libctf
 
 .PHONY: install-html-target
 
 install-html-target: maybe-install-html-target-libstdc++-v3
 install-html-target: maybe-install-html-target-libsanitizer
-install-html-target: maybe-install-html-target-libmpx
 install-html-target: maybe-install-html-target-libvtv
 install-html-target: maybe-install-html-target-liboffloadmic
 install-html-target: maybe-install-html-target-libssp
@@ -1865,6 +1925,7 @@ install-html-target: maybe-install-html-target-libgfortran
 install-html-target: maybe-install-html-target-libobjc
 install-html-target: maybe-install-html-target-libgo
 install-html-target: maybe-install-html-target-libhsail-rt
+install-html-target: maybe-install-html-target-libphobos
 install-html-target: maybe-install-html-target-libtermcap
 install-html-target: maybe-install-html-target-winsup
 install-html-target: maybe-install-html-target-libgloss
@@ -1923,6 +1984,7 @@ installcheck-host: maybe-installcheck-sid
 installcheck-host: maybe-installcheck-sim
 installcheck-host: maybe-installcheck-texinfo
 installcheck-host: maybe-installcheck-zlib
+installcheck-host: maybe-installcheck-gnulib
 installcheck-host: maybe-installcheck-gdb
 installcheck-host: maybe-installcheck-expect
 installcheck-host: maybe-installcheck-guile
@@ -1933,12 +1995,12 @@ installcheck-host: maybe-installcheck-gnattools
 installcheck-host: maybe-installcheck-lto-plugin
 installcheck-host: maybe-installcheck-libcc1
 installcheck-host: maybe-installcheck-gotools
+installcheck-host: maybe-installcheck-libctf
 
 .PHONY: installcheck-target
 
 installcheck-target: maybe-installcheck-target-libstdc++-v3
 installcheck-target: maybe-installcheck-target-libsanitizer
-installcheck-target: maybe-installcheck-target-libmpx
 installcheck-target: maybe-installcheck-target-libvtv
 installcheck-target: maybe-installcheck-target-liboffloadmic
 installcheck-target: maybe-installcheck-target-libssp
@@ -1950,6 +2012,7 @@ installcheck-target: maybe-installcheck-target-libgfortran
 installcheck-target: maybe-installcheck-target-libobjc
 installcheck-target: maybe-installcheck-target-libgo
 installcheck-target: maybe-installcheck-target-libhsail-rt
+installcheck-target: maybe-installcheck-target-libphobos
 installcheck-target: maybe-installcheck-target-libtermcap
 installcheck-target: maybe-installcheck-target-winsup
 installcheck-target: maybe-installcheck-target-libgloss
@@ -2008,6 +2071,7 @@ mostlyclean-host: maybe-mostlyclean-sid
 mostlyclean-host: maybe-mostlyclean-sim
 mostlyclean-host: maybe-mostlyclean-texinfo
 mostlyclean-host: maybe-mostlyclean-zlib
+mostlyclean-host: maybe-mostlyclean-gnulib
 mostlyclean-host: maybe-mostlyclean-gdb
 mostlyclean-host: maybe-mostlyclean-expect
 mostlyclean-host: maybe-mostlyclean-guile
@@ -2018,12 +2082,12 @@ mostlyclean-host: maybe-mostlyclean-gnattools
 mostlyclean-host: maybe-mostlyclean-lto-plugin
 mostlyclean-host: maybe-mostlyclean-libcc1
 mostlyclean-host: maybe-mostlyclean-gotools
+mostlyclean-host: maybe-mostlyclean-libctf
 
 .PHONY: mostlyclean-target
 
 mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3
 mostlyclean-target: maybe-mostlyclean-target-libsanitizer
-mostlyclean-target: maybe-mostlyclean-target-libmpx
 mostlyclean-target: maybe-mostlyclean-target-libvtv
 mostlyclean-target: maybe-mostlyclean-target-liboffloadmic
 mostlyclean-target: maybe-mostlyclean-target-libssp
@@ -2035,6 +2099,7 @@ mostlyclean-target: maybe-mostlyclean-target-libgfortran
 mostlyclean-target: maybe-mostlyclean-target-libobjc
 mostlyclean-target: maybe-mostlyclean-target-libgo
 mostlyclean-target: maybe-mostlyclean-target-libhsail-rt
+mostlyclean-target: maybe-mostlyclean-target-libphobos
 mostlyclean-target: maybe-mostlyclean-target-libtermcap
 mostlyclean-target: maybe-mostlyclean-target-winsup
 mostlyclean-target: maybe-mostlyclean-target-libgloss
@@ -2093,6 +2158,7 @@ clean-host: maybe-clean-sid
 clean-host: maybe-clean-sim
 clean-host: maybe-clean-texinfo
 clean-host: maybe-clean-zlib
+clean-host: maybe-clean-gnulib
 clean-host: maybe-clean-gdb
 clean-host: maybe-clean-expect
 clean-host: maybe-clean-guile
@@ -2103,12 +2169,12 @@ clean-host: maybe-clean-gnattools
 clean-host: maybe-clean-lto-plugin
 clean-host: maybe-clean-libcc1
 clean-host: maybe-clean-gotools
+clean-host: maybe-clean-libctf
 
 .PHONY: clean-target
 
 clean-target: maybe-clean-target-libstdc++-v3
 clean-target: maybe-clean-target-libsanitizer
-clean-target: maybe-clean-target-libmpx
 clean-target: maybe-clean-target-libvtv
 clean-target: maybe-clean-target-liboffloadmic
 clean-target: maybe-clean-target-libssp
@@ -2120,6 +2186,7 @@ clean-target: maybe-clean-target-libgfortran
 clean-target: maybe-clean-target-libobjc
 clean-target: maybe-clean-target-libgo
 clean-target: maybe-clean-target-libhsail-rt
+clean-target: maybe-clean-target-libphobos
 clean-target: maybe-clean-target-libtermcap
 clean-target: maybe-clean-target-winsup
 clean-target: maybe-clean-target-libgloss
@@ -2178,6 +2245,7 @@ distclean-host: maybe-distclean-sid
 distclean-host: maybe-distclean-sim
 distclean-host: maybe-distclean-texinfo
 distclean-host: maybe-distclean-zlib
+distclean-host: maybe-distclean-gnulib
 distclean-host: maybe-distclean-gdb
 distclean-host: maybe-distclean-expect
 distclean-host: maybe-distclean-guile
@@ -2188,12 +2256,12 @@ distclean-host: maybe-distclean-gnattools
 distclean-host: maybe-distclean-lto-plugin
 distclean-host: maybe-distclean-libcc1
 distclean-host: maybe-distclean-gotools
+distclean-host: maybe-distclean-libctf
 
 .PHONY: distclean-target
 
 distclean-target: maybe-distclean-target-libstdc++-v3
 distclean-target: maybe-distclean-target-libsanitizer
-distclean-target: maybe-distclean-target-libmpx
 distclean-target: maybe-distclean-target-libvtv
 distclean-target: maybe-distclean-target-liboffloadmic
 distclean-target: maybe-distclean-target-libssp
@@ -2205,6 +2273,7 @@ distclean-target: maybe-distclean-target-libgfortran
 distclean-target: maybe-distclean-target-libobjc
 distclean-target: maybe-distclean-target-libgo
 distclean-target: maybe-distclean-target-libhsail-rt
+distclean-target: maybe-distclean-target-libphobos
 distclean-target: maybe-distclean-target-libtermcap
 distclean-target: maybe-distclean-target-winsup
 distclean-target: maybe-distclean-target-libgloss
@@ -2263,6 +2332,7 @@ maintainer-clean-host: maybe-maintainer-clean-sid
 maintainer-clean-host: maybe-maintainer-clean-sim
 maintainer-clean-host: maybe-maintainer-clean-texinfo
 maintainer-clean-host: maybe-maintainer-clean-zlib
+maintainer-clean-host: maybe-maintainer-clean-gnulib
 maintainer-clean-host: maybe-maintainer-clean-gdb
 maintainer-clean-host: maybe-maintainer-clean-expect
 maintainer-clean-host: maybe-maintainer-clean-guile
@@ -2273,12 +2343,12 @@ maintainer-clean-host: maybe-maintainer-clean-gnattools
 maintainer-clean-host: maybe-maintainer-clean-lto-plugin
 maintainer-clean-host: maybe-maintainer-clean-libcc1
 maintainer-clean-host: maybe-maintainer-clean-gotools
+maintainer-clean-host: maybe-maintainer-clean-libctf
 
 .PHONY: maintainer-clean-target
 
 maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3
 maintainer-clean-target: maybe-maintainer-clean-target-libsanitizer
-maintainer-clean-target: maybe-maintainer-clean-target-libmpx
 maintainer-clean-target: maybe-maintainer-clean-target-libvtv
 maintainer-clean-target: maybe-maintainer-clean-target-liboffloadmic
 maintainer-clean-target: maybe-maintainer-clean-target-libssp
@@ -2290,6 +2360,7 @@ maintainer-clean-target: maybe-maintainer-clean-target-libgfortran
 maintainer-clean-target: maybe-maintainer-clean-target-libobjc
 maintainer-clean-target: maybe-maintainer-clean-target-libgo
 maintainer-clean-target: maybe-maintainer-clean-target-libhsail-rt
+maintainer-clean-target: maybe-maintainer-clean-target-libphobos
 maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
 maintainer-clean-target: maybe-maintainer-clean-target-winsup
 maintainer-clean-target: maybe-maintainer-clean-target-libgloss
@@ -2404,6 +2475,7 @@ check-host:  \
     maybe-check-sim \
     maybe-check-texinfo \
     maybe-check-zlib \
+    maybe-check-gnulib \
     maybe-check-gdb \
     maybe-check-expect \
     maybe-check-guile \
@@ -2413,13 +2485,13 @@ check-host:  \
     maybe-check-gnattools \
     maybe-check-lto-plugin \
     maybe-check-libcc1 \
-    maybe-check-gotools
+    maybe-check-gotools \
+    maybe-check-libctf
 
 .PHONY: check-target
 check-target:  \
     maybe-check-target-libstdc++-v3 \
     maybe-check-target-libsanitizer \
-    maybe-check-target-libmpx \
     maybe-check-target-libvtv \
     maybe-check-target-liboffloadmic \
     maybe-check-target-libssp \
@@ -2431,6 +2503,7 @@ check-target:  \
     maybe-check-target-libobjc \
     maybe-check-target-libgo \
     maybe-check-target-libhsail-rt \
+    maybe-check-target-libphobos \
     maybe-check-target-libtermcap \
     maybe-check-target-winsup \
     maybe-check-target-libgloss \
@@ -2536,6 +2609,7 @@ install-host-nogcc:  \
     maybe-install-sim \
     maybe-install-texinfo \
     maybe-install-zlib \
+    maybe-install-gnulib \
     maybe-install-gdb \
     maybe-install-expect \
     maybe-install-guile \
@@ -2545,7 +2619,8 @@ install-host-nogcc:  \
     maybe-install-gnattools \
     maybe-install-lto-plugin \
     maybe-install-libcc1 \
-    maybe-install-gotools
+    maybe-install-gotools \
+    maybe-install-libctf
 
 .PHONY: install-host
 install-host:  \
@@ -2585,6 +2660,7 @@ install-host:  \
     maybe-install-sim \
     maybe-install-texinfo \
     maybe-install-zlib \
+    maybe-install-gnulib \
     maybe-install-gdb \
     maybe-install-expect \
     maybe-install-guile \
@@ -2594,13 +2670,13 @@ install-host:  \
     maybe-install-gnattools \
     maybe-install-lto-plugin \
     maybe-install-libcc1 \
-    maybe-install-gotools
+    maybe-install-gotools \
+    maybe-install-libctf
 
 .PHONY: install-target
 install-target:  \
     maybe-install-target-libstdc++-v3 \
     maybe-install-target-libsanitizer \
-    maybe-install-target-libmpx \
     maybe-install-target-libvtv \
     maybe-install-target-liboffloadmic \
     maybe-install-target-libssp \
@@ -2612,6 +2688,7 @@ install-target:  \
     maybe-install-target-libobjc \
     maybe-install-target-libgo \
     maybe-install-target-libhsail-rt \
+    maybe-install-target-libphobos \
     maybe-install-target-libtermcap \
     maybe-install-target-winsup \
     maybe-install-target-libgloss \
@@ -2690,6 +2767,7 @@ install-strip-host:  \
     maybe-install-strip-sim \
     maybe-install-strip-texinfo \
     maybe-install-strip-zlib \
+    maybe-install-strip-gnulib \
     maybe-install-strip-gdb \
     maybe-install-strip-expect \
     maybe-install-strip-guile \
@@ -2699,13 +2777,13 @@ install-strip-host:  \
     maybe-install-strip-gnattools \
     maybe-install-strip-lto-plugin \
     maybe-install-strip-libcc1 \
-    maybe-install-strip-gotools
+    maybe-install-strip-gotools \
+    maybe-install-strip-libctf
 
 .PHONY: install-strip-target
 install-strip-target:  \
     maybe-install-strip-target-libstdc++-v3 \
     maybe-install-strip-target-libsanitizer \
-    maybe-install-strip-target-libmpx \
     maybe-install-strip-target-libvtv \
     maybe-install-strip-target-liboffloadmic \
     maybe-install-strip-target-libssp \
@@ -2717,6 +2795,7 @@ install-strip-target:  \
     maybe-install-strip-target-libobjc \
     maybe-install-strip-target-libgo \
     maybe-install-strip-target-libhsail-rt \
+    maybe-install-strip-target-libphobos \
     maybe-install-strip-target-libtermcap \
     maybe-install-strip-target-winsup \
     maybe-install-strip-target-libgloss \
@@ -3544,6 +3623,7 @@ all-stage1-bfd: configure-stage1-bfd
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3588,6 +3668,7 @@ all-stage2-bfd: configure-stage2-bfd
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3630,6 +3711,7 @@ all-stage3-bfd: configure-stage3-bfd
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3672,6 +3754,7 @@ all-stage4-bfd: configure-stage4-bfd
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3714,6 +3797,7 @@ all-stageprofile-bfd: configure-stageprofile-bfd
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3756,6 +3840,7 @@ all-stagetrain-bfd: configure-stagetrain-bfd
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3798,6 +3883,7 @@ all-stagefeedback-bfd: configure-stagefeedback-bfd
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3840,6 +3926,7 @@ all-stageautoprofile-bfd: configure-stageautoprofile-bfd
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3882,6 +3969,7 @@ all-stageautofeedback-bfd: configure-stageautofeedback-bfd
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4649,6 +4737,7 @@ all-stage1-opcodes: configure-stage1-opcodes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4693,6 +4782,7 @@ all-stage2-opcodes: configure-stage2-opcodes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4735,6 +4825,7 @@ all-stage3-opcodes: configure-stage3-opcodes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4777,6 +4868,7 @@ all-stage4-opcodes: configure-stage4-opcodes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4819,6 +4911,7 @@ all-stageprofile-opcodes: configure-stageprofile-opcodes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4861,6 +4954,7 @@ all-stagetrain-opcodes: configure-stagetrain-opcodes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4903,6 +4997,7 @@ all-stagefeedback-opcodes: configure-stagefeedback-opcodes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4945,6 +5040,7 @@ all-stageautoprofile-opcodes: configure-stageautoprofile-opcodes
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4987,6 +5083,7 @@ all-stageautofeedback-opcodes: configure-stageautofeedback-opcodes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -5754,6 +5851,7 @@ all-stage1-binutils: configure-stage1-binutils
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -5798,6 +5896,7 @@ all-stage2-binutils: configure-stage2-binutils
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -5840,6 +5939,7 @@ all-stage3-binutils: configure-stage3-binutils
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -5882,6 +5982,7 @@ all-stage4-binutils: configure-stage4-binutils
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -5924,6 +6025,7 @@ all-stageprofile-binutils: configure-stageprofile-binutils
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -5966,6 +6068,7 @@ all-stagetrain-binutils: configure-stagetrain-binutils
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -6008,6 +6111,7 @@ all-stagefeedback-binutils: configure-stagefeedback-binutils
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -6050,6 +6154,7 @@ all-stageautoprofile-binutils: configure-stageautoprofile-binutils
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -6092,6 +6197,7 @@ all-stageautofeedback-binutils: configure-stageautofeedback-binutils
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9070,6 +9176,7 @@ all-stage1-fixincludes: configure-stage1-fixincludes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9114,6 +9221,7 @@ all-stage2-fixincludes: configure-stage2-fixincludes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9156,6 +9264,7 @@ all-stage3-fixincludes: configure-stage3-fixincludes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9198,6 +9307,7 @@ all-stage4-fixincludes: configure-stage4-fixincludes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9240,6 +9350,7 @@ all-stageprofile-fixincludes: configure-stageprofile-fixincludes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9282,6 +9393,7 @@ all-stagetrain-fixincludes: configure-stagetrain-fixincludes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9324,6 +9436,7 @@ all-stagefeedback-fixincludes: configure-stagefeedback-fixincludes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9366,6 +9479,7 @@ all-stageautoprofile-fixincludes: configure-stageautoprofile-fixincludes
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9408,6 +9522,7 @@ all-stageautofeedback-fixincludes: configure-stageautofeedback-fixincludes
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10604,6 +10719,7 @@ all-stage1-gas: configure-stage1-gas
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10648,6 +10764,7 @@ all-stage2-gas: configure-stage2-gas
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10690,6 +10807,7 @@ all-stage3-gas: configure-stage3-gas
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10732,6 +10850,7 @@ all-stage4-gas: configure-stage4-gas
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10774,6 +10893,7 @@ all-stageprofile-gas: configure-stageprofile-gas
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10816,6 +10936,7 @@ all-stagetrain-gas: configure-stagetrain-gas
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10858,6 +10979,7 @@ all-stagefeedback-gas: configure-stagefeedback-gas
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10900,6 +11022,7 @@ all-stageautoprofile-gas: configure-stageautoprofile-gas
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10942,6 +11065,7 @@ all-stageautofeedback-gas: configure-stageautofeedback-gas
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -11709,6 +11833,7 @@ all-stage1-gcc: configure-stage1-gcc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -11753,6 +11878,7 @@ all-stage2-gcc: configure-stage2-gcc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -11795,6 +11921,7 @@ all-stage3-gcc: configure-stage3-gcc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -11837,6 +11964,7 @@ all-stage4-gcc: configure-stage4-gcc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -11879,6 +12007,7 @@ all-stageprofile-gcc: configure-stageprofile-gcc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -11921,6 +12050,7 @@ all-stagetrain-gcc: configure-stagetrain-gcc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -11963,6 +12093,7 @@ all-stagefeedback-gcc: configure-stagefeedback-gcc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -12005,6 +12136,7 @@ all-stageautoprofile-gcc: configure-stageautoprofile-gcc
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -12047,6 +12179,7 @@ all-stageautofeedback-gcc: configure-stageautofeedback-gcc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -12823,6 +12956,7 @@ all-stage1-gmp: configure-stage1-gmp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -12867,6 +13001,7 @@ all-stage2-gmp: configure-stage2-gmp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -12909,6 +13044,7 @@ all-stage3-gmp: configure-stage3-gmp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -12951,6 +13087,7 @@ all-stage4-gmp: configure-stage4-gmp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -12993,6 +13130,7 @@ all-stageprofile-gmp: configure-stageprofile-gmp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -13035,6 +13173,7 @@ all-stagetrain-gmp: configure-stagetrain-gmp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -13077,6 +13216,7 @@ all-stagefeedback-gmp: configure-stagefeedback-gmp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -13119,6 +13259,7 @@ all-stageautoprofile-gmp: configure-stageautoprofile-gmp
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -13161,6 +13302,7 @@ all-stageautofeedback-gmp: configure-stageautofeedback-gmp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -13925,6 +14067,7 @@ all-stage1-mpfr: configure-stage1-mpfr
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -13969,6 +14112,7 @@ all-stage2-mpfr: configure-stage2-mpfr
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14011,6 +14155,7 @@ all-stage3-mpfr: configure-stage3-mpfr
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14053,6 +14198,7 @@ all-stage4-mpfr: configure-stage4-mpfr
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14095,6 +14241,7 @@ all-stageprofile-mpfr: configure-stageprofile-mpfr
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14137,6 +14284,7 @@ all-stagetrain-mpfr: configure-stagetrain-mpfr
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14179,6 +14327,7 @@ all-stagefeedback-mpfr: configure-stagefeedback-mpfr
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14221,6 +14370,7 @@ all-stageautoprofile-mpfr: configure-stageautoprofile-mpfr
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14263,6 +14413,7 @@ all-stageautofeedback-mpfr: configure-stageautofeedback-mpfr
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15027,6 +15178,7 @@ all-stage1-mpc: configure-stage1-mpc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15071,6 +15223,7 @@ all-stage2-mpc: configure-stage2-mpc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15113,6 +15266,7 @@ all-stage3-mpc: configure-stage3-mpc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15155,6 +15309,7 @@ all-stage4-mpc: configure-stage4-mpc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15197,6 +15352,7 @@ all-stageprofile-mpc: configure-stageprofile-mpc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15239,6 +15395,7 @@ all-stagetrain-mpc: configure-stagetrain-mpc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15281,6 +15438,7 @@ all-stagefeedback-mpc: configure-stagefeedback-mpc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15323,6 +15481,7 @@ all-stageautoprofile-mpc: configure-stageautoprofile-mpc
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15365,6 +15524,7 @@ all-stageautofeedback-mpc: configure-stageautofeedback-mpc
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16129,6 +16289,7 @@ all-stage1-isl: configure-stage1-isl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16173,6 +16334,7 @@ all-stage2-isl: configure-stage2-isl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16215,6 +16377,7 @@ all-stage3-isl: configure-stage3-isl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16257,6 +16420,7 @@ all-stage4-isl: configure-stage4-isl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16299,6 +16463,7 @@ all-stageprofile-isl: configure-stageprofile-isl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16341,6 +16506,7 @@ all-stagetrain-isl: configure-stagetrain-isl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16383,6 +16549,7 @@ all-stagefeedback-isl: configure-stagefeedback-isl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16425,6 +16592,7 @@ all-stageautoprofile-isl: configure-stageautoprofile-isl
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16467,6 +16635,7 @@ all-stageautofeedback-isl: configure-stageautofeedback-isl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17231,6 +17400,7 @@ all-stage1-libelf: configure-stage1-libelf
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17275,6 +17445,7 @@ all-stage2-libelf: configure-stage2-libelf
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17317,6 +17488,7 @@ all-stage3-libelf: configure-stage3-libelf
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17359,6 +17531,7 @@ all-stage4-libelf: configure-stage4-libelf
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17401,6 +17574,7 @@ all-stageprofile-libelf: configure-stageprofile-libelf
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17443,6 +17617,7 @@ all-stagetrain-libelf: configure-stagetrain-libelf
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17485,6 +17660,7 @@ all-stagefeedback-libelf: configure-stagefeedback-libelf
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17527,6 +17703,7 @@ all-stageautoprofile-libelf: configure-stageautoprofile-libelf
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17569,6 +17746,7 @@ all-stageautofeedback-libelf: configure-stageautofeedback-libelf
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18324,6 +18502,7 @@ all-stage1-gold: configure-stage1-gold
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18368,6 +18547,7 @@ all-stage2-gold: configure-stage2-gold
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18410,6 +18590,7 @@ all-stage3-gold: configure-stage3-gold
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18452,6 +18633,7 @@ all-stage4-gold: configure-stage4-gold
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18494,6 +18676,7 @@ all-stageprofile-gold: configure-stageprofile-gold
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18536,6 +18719,7 @@ all-stagetrain-gold: configure-stagetrain-gold
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18578,6 +18762,7 @@ all-stagefeedback-gold: configure-stagefeedback-gold
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18620,6 +18805,7 @@ all-stageautoprofile-gold: configure-stageautoprofile-gold
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18662,6 +18848,7 @@ all-stageautofeedback-gold: configure-stageautofeedback-gold
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -19870,6 +20057,7 @@ all-stage1-intl: configure-stage1-intl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -19914,6 +20102,7 @@ all-stage2-intl: configure-stage2-intl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -19956,6 +20145,7 @@ all-stage3-intl: configure-stage3-intl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -19998,6 +20188,7 @@ all-stage4-intl: configure-stage4-intl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -20040,6 +20231,7 @@ all-stageprofile-intl: configure-stageprofile-intl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -20082,6 +20274,7 @@ all-stagetrain-intl: configure-stagetrain-intl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -20124,6 +20317,7 @@ all-stagefeedback-intl: configure-stagefeedback-intl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -20166,6 +20360,7 @@ all-stageautoprofile-intl: configure-stageautoprofile-intl
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -20208,6 +20403,7 @@ all-stageautofeedback-intl: configure-stageautofeedback-intl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -21842,6 +22038,7 @@ all-stage1-ld: configure-stage1-ld
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -21886,6 +22083,7 @@ all-stage2-ld: configure-stage2-ld
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -21928,6 +22126,7 @@ all-stage3-ld: configure-stage3-ld
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -21970,6 +22169,7 @@ all-stage4-ld: configure-stage4-ld
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22012,6 +22212,7 @@ all-stageprofile-ld: configure-stageprofile-ld
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22054,6 +22255,7 @@ all-stagetrain-ld: configure-stagetrain-ld
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22096,6 +22298,7 @@ all-stagefeedback-ld: configure-stagefeedback-ld
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22138,6 +22341,7 @@ all-stageautoprofile-ld: configure-stageautoprofile-ld
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22180,6 +22384,7 @@ all-stageautofeedback-ld: configure-stageautofeedback-ld
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22947,6 +23152,7 @@ all-stage1-libbacktrace: configure-stage1-libbacktrace
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22991,6 +23197,7 @@ all-stage2-libbacktrace: configure-stage2-libbacktrace
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23033,6 +23240,7 @@ all-stage3-libbacktrace: configure-stage3-libbacktrace
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23075,6 +23283,7 @@ all-stage4-libbacktrace: configure-stage4-libbacktrace
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23117,6 +23326,7 @@ all-stageprofile-libbacktrace: configure-stageprofile-libbacktrace
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23159,6 +23369,7 @@ all-stagetrain-libbacktrace: configure-stagetrain-libbacktrace
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23201,6 +23412,7 @@ all-stagefeedback-libbacktrace: configure-stagefeedback-libbacktrace
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23243,6 +23455,7 @@ all-stageautoprofile-libbacktrace: configure-stageautoprofile-libbacktrace
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23285,6 +23498,7 @@ all-stageautofeedback-libbacktrace: configure-stageautofeedback-libbacktrace
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24052,6 +24266,7 @@ all-stage1-libcpp: configure-stage1-libcpp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24096,6 +24311,7 @@ all-stage2-libcpp: configure-stage2-libcpp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24138,6 +24354,7 @@ all-stage3-libcpp: configure-stage3-libcpp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24180,6 +24397,7 @@ all-stage4-libcpp: configure-stage4-libcpp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24222,6 +24440,7 @@ all-stageprofile-libcpp: configure-stageprofile-libcpp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24264,6 +24483,7 @@ all-stagetrain-libcpp: configure-stagetrain-libcpp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24306,6 +24526,7 @@ all-stagefeedback-libcpp: configure-stagefeedback-libcpp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24348,6 +24569,7 @@ all-stageautoprofile-libcpp: configure-stageautoprofile-libcpp
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24390,6 +24612,7 @@ all-stageautofeedback-libcpp: configure-stageautofeedback-libcpp
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25157,6 +25380,7 @@ all-stage1-libdecnumber: configure-stage1-libdecnumber
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25201,6 +25425,7 @@ all-stage2-libdecnumber: configure-stage2-libdecnumber
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25243,6 +25468,7 @@ all-stage3-libdecnumber: configure-stage3-libdecnumber
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25285,6 +25511,7 @@ all-stage4-libdecnumber: configure-stage4-libdecnumber
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25327,6 +25554,7 @@ all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25369,6 +25597,7 @@ all-stagetrain-libdecnumber: configure-stagetrain-libdecnumber
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25411,6 +25640,7 @@ all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25453,6 +25683,7 @@ all-stageautoprofile-libdecnumber: configure-stageautoprofile-libdecnumber
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25495,6 +25726,7 @@ all-stageautofeedback-libdecnumber: configure-stageautofeedback-libdecnumber
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -26712,6 +26944,7 @@ all-stage1-libiberty: configure-stage1-libiberty
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -26756,6 +26989,7 @@ all-stage2-libiberty: configure-stage2-libiberty
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -26798,6 +27032,7 @@ all-stage3-libiberty: configure-stage3-libiberty
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -26840,6 +27075,7 @@ all-stage4-libiberty: configure-stage4-libiberty
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -26882,6 +27118,7 @@ all-stageprofile-libiberty: configure-stageprofile-libiberty
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -26924,6 +27161,7 @@ all-stagetrain-libiberty: configure-stagetrain-libiberty
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -26966,6 +27204,7 @@ all-stagefeedback-libiberty: configure-stagefeedback-libiberty
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -27008,6 +27247,7 @@ all-stageautoprofile-libiberty: configure-stageautoprofile-libiberty
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -27050,6 +27290,7 @@ all-stageautofeedback-libiberty: configure-stageautofeedback-libiberty
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -27826,6 +28067,7 @@ all-stage1-libiberty-linker-plugin: configure-stage1-libiberty-linker-plugin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -27870,6 +28112,7 @@ all-stage2-libiberty-linker-plugin: configure-stage2-libiberty-linker-plugin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -27912,6 +28155,7 @@ all-stage3-libiberty-linker-plugin: configure-stage3-libiberty-linker-plugin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -27954,6 +28198,7 @@ all-stage4-libiberty-linker-plugin: configure-stage4-libiberty-linker-plugin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -27996,6 +28241,7 @@ all-stageprofile-libiberty-linker-plugin: configure-stageprofile-libiberty-linke
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -28038,6 +28284,7 @@ all-stagetrain-libiberty-linker-plugin: configure-stagetrain-libiberty-linker-pl
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -28080,6 +28327,7 @@ all-stagefeedback-libiberty-linker-plugin: configure-stagefeedback-libiberty-lin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -28122,6 +28370,7 @@ all-stageautoprofile-libiberty-linker-plugin: configure-stageautoprofile-libiber
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -28164,6 +28413,7 @@ all-stageautofeedback-libiberty-linker-plugin: configure-stageautofeedback-libib
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -28940,6 +29190,7 @@ all-stage1-libiconv: configure-stage1-libiconv
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -28984,6 +29235,7 @@ all-stage2-libiconv: configure-stage2-libiconv
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29026,6 +29278,7 @@ all-stage3-libiconv: configure-stage3-libiconv
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29068,6 +29321,7 @@ all-stage4-libiconv: configure-stage4-libiconv
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29110,6 +29364,7 @@ all-stageprofile-libiconv: configure-stageprofile-libiconv
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29152,6 +29407,7 @@ all-stagetrain-libiconv: configure-stagetrain-libiconv
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29194,6 +29450,7 @@ all-stagefeedback-libiconv: configure-stagefeedback-libiconv
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29236,6 +29493,7 @@ all-stageautoprofile-libiconv: configure-stageautoprofile-libiconv
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29278,6 +29536,7 @@ all-stageautofeedback-libiconv: configure-stageautofeedback-libiconv
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32142,6 +32401,7 @@ all-stage1-zlib: configure-stage1-zlib
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32186,6 +32446,7 @@ all-stage2-zlib: configure-stage2-zlib
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32228,6 +32489,7 @@ all-stage3-zlib: configure-stage3-zlib
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32270,6 +32532,7 @@ all-stage4-zlib: configure-stage4-zlib
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32312,6 +32575,7 @@ all-stageprofile-zlib: configure-stageprofile-zlib
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32354,6 +32618,7 @@ all-stagetrain-zlib: configure-stagetrain-zlib
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32396,6 +32661,7 @@ all-stagefeedback-zlib: configure-stagefeedback-zlib
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32438,6 +32704,7 @@ all-stageautoprofile-zlib: configure-stageautoprofile-zlib
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32480,6 +32747,7 @@ all-stageautofeedback-zlib: configure-stageautofeedback-zlib
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32861,6 +33129,447 @@ maintainer-clean-zlib:
 
 
 
+.PHONY: configure-gnulib maybe-configure-gnulib
+maybe-configure-gnulib:
+@if gcc-bootstrap
+configure-gnulib: stage_current
+@endif gcc-bootstrap
+@if gnulib
+maybe-configure-gnulib: configure-gnulib
+configure-gnulib: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(HOST_SUBDIR)/gnulib/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnulib; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/gnulib; \
+       cd "$(HOST_SUBDIR)/gnulib" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gnulib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=gnulib; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias}  \
+         || exit 1
+@endif gnulib
+
+
+
+
+
+.PHONY: all-gnulib maybe-all-gnulib
+maybe-all-gnulib:
+@if gcc-bootstrap
+all-gnulib: stage_current
+@endif gcc-bootstrap
+@if gnulib
+TARGET-gnulib=all
+maybe-all-gnulib: all-gnulib
+all-gnulib: configure-gnulib
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gnulib))
+@endif gnulib
+
+
+
+
+.PHONY: check-gnulib maybe-check-gnulib
+maybe-check-gnulib:
+@if gnulib
+maybe-check-gnulib: check-gnulib
+
+check-gnulib:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif gnulib
+
+.PHONY: install-gnulib maybe-install-gnulib
+maybe-install-gnulib:
+@if gnulib
+maybe-install-gnulib: install-gnulib
+
+install-gnulib: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif gnulib
+
+.PHONY: install-strip-gnulib maybe-install-strip-gnulib
+maybe-install-strip-gnulib:
+@if gnulib
+maybe-install-strip-gnulib: install-strip-gnulib
+
+install-strip-gnulib: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gnulib
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gnulib info-gnulib
+maybe-info-gnulib:
+@if gnulib
+maybe-info-gnulib: info-gnulib
+
+info-gnulib: \
+    configure-gnulib 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing info in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 info) \
+         || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-dvi-gnulib dvi-gnulib
+maybe-dvi-gnulib:
+@if gnulib
+maybe-dvi-gnulib: dvi-gnulib
+
+dvi-gnulib: \
+    configure-gnulib 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing dvi in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 dvi) \
+         || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-pdf-gnulib pdf-gnulib
+maybe-pdf-gnulib:
+@if gnulib
+maybe-pdf-gnulib: pdf-gnulib
+
+pdf-gnulib: \
+    configure-gnulib 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing pdf in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 pdf) \
+         || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-html-gnulib html-gnulib
+maybe-html-gnulib:
+@if gnulib
+maybe-html-gnulib: html-gnulib
+
+html-gnulib: \
+    configure-gnulib 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 html) \
+         || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-TAGS-gnulib TAGS-gnulib
+maybe-TAGS-gnulib:
+@if gnulib
+maybe-TAGS-gnulib: TAGS-gnulib
+
+TAGS-gnulib: \
+    configure-gnulib 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 TAGS) \
+         || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-install-info-gnulib install-info-gnulib
+maybe-install-info-gnulib:
+@if gnulib
+maybe-install-info-gnulib: install-info-gnulib
+
+install-info-gnulib: \
+    configure-gnulib \
+    info-gnulib 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-info in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 install-info) \
+         || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-install-pdf-gnulib install-pdf-gnulib
+maybe-install-pdf-gnulib:
+@if gnulib
+maybe-install-pdf-gnulib: install-pdf-gnulib
+
+install-pdf-gnulib: \
+    configure-gnulib \
+    pdf-gnulib 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-pdf in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 install-pdf) \
+         || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-install-html-gnulib install-html-gnulib
+maybe-install-html-gnulib:
+@if gnulib
+maybe-install-html-gnulib: install-html-gnulib
+
+install-html-gnulib: \
+    configure-gnulib \
+    html-gnulib 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-html in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 install-html) \
+         || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-installcheck-gnulib installcheck-gnulib
+maybe-installcheck-gnulib:
+@if gnulib
+maybe-installcheck-gnulib: installcheck-gnulib
+
+installcheck-gnulib: \
+    configure-gnulib 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing installcheck in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 installcheck) \
+         || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-mostlyclean-gnulib mostlyclean-gnulib
+maybe-mostlyclean-gnulib:
+@if gnulib
+maybe-mostlyclean-gnulib: mostlyclean-gnulib
+
+mostlyclean-gnulib: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing mostlyclean in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 mostlyclean) \
+         || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-clean-gnulib clean-gnulib
+maybe-clean-gnulib:
+@if gnulib
+maybe-clean-gnulib: clean-gnulib
+
+clean-gnulib: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing clean in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 clean) \
+         || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-distclean-gnulib distclean-gnulib
+maybe-distclean-gnulib:
+@if gnulib
+maybe-distclean-gnulib: distclean-gnulib
+
+distclean-gnulib: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing distclean in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 distclean) \
+         || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-maintainer-clean-gnulib maintainer-clean-gnulib
+maybe-maintainer-clean-gnulib:
+@if gnulib
+maybe-maintainer-clean-gnulib: maintainer-clean-gnulib
+
+maintainer-clean-gnulib: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnulib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing maintainer-clean in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 maintainer-clean) \
+         || exit 1
+
+@endif gnulib
+
+
+
 .PHONY: configure-gdb maybe-configure-gdb
 maybe-configure-gdb:
 @if gcc-bootstrap
@@ -36253,6 +36962,7 @@ all-stage1-lto-plugin: configure-stage1-lto-plugin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
                LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36297,6 +37007,7 @@ all-stage2-lto-plugin: configure-stage2-lto-plugin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36339,6 +37050,7 @@ all-stage3-lto-plugin: configure-stage3-lto-plugin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36381,6 +37093,7 @@ all-stage4-lto-plugin: configure-stage4-lto-plugin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36423,6 +37136,7 @@ all-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36465,6 +37179,7 @@ all-stagetrain-lto-plugin: configure-stagetrain-lto-plugin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36507,6 +37222,7 @@ all-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36549,6 +37265,7 @@ all-stageautoprofile-lto-plugin: configure-stageautoprofile-lto-plugin
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36591,6 +37308,7 @@ all-stageautofeedback-lto-plugin: configure-stageautofeedback-lto-plugin
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
                CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
                LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -37872,1290 +38590,1143 @@ maintainer-clean-gotools:
 
 
 
-# ---------------------------------------
-# Modules which run on the target machine
-# ---------------------------------------
-
-
-
-
-.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
-maybe-configure-target-libstdc++-v3:
+.PHONY: configure-libctf maybe-configure-libctf
+maybe-configure-libctf:
 @if gcc-bootstrap
-configure-target-libstdc++-v3: stage_current
+configure-libctf: stage_current
 @endif gcc-bootstrap
-@if target-libstdc++-v3
-maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
-configure-target-libstdc++-v3: 
+@if libctf
+maybe-configure-libctf: configure-libctf
+configure-libctf: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-       $(RAW_CXX_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libctf; \
+       cd "$(HOST_SUBDIR)/libctf" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
-       rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) \
+       module_srcdir=libctf; \
+       $(SHELL) \
          $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif target-libstdc++-v3
+@endif libctf
 
 
 
-.PHONY: configure-stage1-target-libstdc++-v3 maybe-configure-stage1-target-libstdc++-v3
-maybe-configure-stage1-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
-configure-stage1-target-libstdc++-v3:
+.PHONY: configure-stage1-libctf maybe-configure-stage1-libctf
+maybe-configure-stage1-libctf:
+@if libctf-bootstrap
+maybe-configure-stage1-libctf: configure-stage1-libctf
+configure-stage1-libctf:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(TARGET_SUBDIR)/libstdc++-v3; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       module_srcdir=libctf; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
           \
          $(STAGE1_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif libctf-bootstrap
 
-.PHONY: configure-stage2-target-libstdc++-v3 maybe-configure-stage2-target-libstdc++-v3
-maybe-configure-stage2-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
-configure-stage2-target-libstdc++-v3:
+.PHONY: configure-stage2-libctf maybe-configure-stage2-libctf
+maybe-configure-stage2-libctf:
+@if libctf-bootstrap
+maybe-configure-stage2-libctf: configure-stage2-libctf
+configure-stage2-libctf:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(TARGET_SUBDIR)/libstdc++-v3; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       module_srcdir=libctf; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif libctf-bootstrap
 
-.PHONY: configure-stage3-target-libstdc++-v3 maybe-configure-stage3-target-libstdc++-v3
-maybe-configure-stage3-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
-configure-stage3-target-libstdc++-v3:
+.PHONY: configure-stage3-libctf maybe-configure-stage3-libctf
+maybe-configure-stage3-libctf:
+@if libctf-bootstrap
+maybe-configure-stage3-libctf: configure-stage3-libctf
+configure-stage3-libctf:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(TARGET_SUBDIR)/libstdc++-v3; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       module_srcdir=libctf; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif libctf-bootstrap
 
-.PHONY: configure-stage4-target-libstdc++-v3 maybe-configure-stage4-target-libstdc++-v3
-maybe-configure-stage4-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
-configure-stage4-target-libstdc++-v3:
+.PHONY: configure-stage4-libctf maybe-configure-stage4-libctf
+maybe-configure-stage4-libctf:
+@if libctf-bootstrap
+maybe-configure-stage4-libctf: configure-stage4-libctf
+configure-stage4-libctf:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(TARGET_SUBDIR)/libstdc++-v3; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       module_srcdir=libctf; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif libctf-bootstrap
 
-.PHONY: configure-stageprofile-target-libstdc++-v3 maybe-configure-stageprofile-target-libstdc++-v3
-maybe-configure-stageprofile-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
-configure-stageprofile-target-libstdc++-v3:
+.PHONY: configure-stageprofile-libctf maybe-configure-stageprofile-libctf
+maybe-configure-stageprofile-libctf:
+@if libctf-bootstrap
+maybe-configure-stageprofile-libctf: configure-stageprofile-libctf
+configure-stageprofile-libctf:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(TARGET_SUBDIR)/libstdc++-v3; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       module_srcdir=libctf; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif libctf-bootstrap
 
-.PHONY: configure-stagetrain-target-libstdc++-v3 maybe-configure-stagetrain-target-libstdc++-v3
-maybe-configure-stagetrain-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stagetrain-target-libstdc++-v3: configure-stagetrain-target-libstdc++-v3
-configure-stagetrain-target-libstdc++-v3:
+.PHONY: configure-stagetrain-libctf maybe-configure-stagetrain-libctf
+maybe-configure-stagetrain-libctf:
+@if libctf-bootstrap
+maybe-configure-stagetrain-libctf: configure-stagetrain-libctf
+configure-stagetrain-libctf:
        @[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEtrain_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage train in $(TARGET_SUBDIR)/libstdc++-v3; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage train in $(HOST_SUBDIR)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       module_srcdir=libctf; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEtrain_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif libctf-bootstrap
 
-.PHONY: configure-stagefeedback-target-libstdc++-v3 maybe-configure-stagefeedback-target-libstdc++-v3
-maybe-configure-stagefeedback-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3
-configure-stagefeedback-target-libstdc++-v3:
+.PHONY: configure-stagefeedback-libctf maybe-configure-stagefeedback-libctf
+maybe-configure-stagefeedback-libctf:
+@if libctf-bootstrap
+maybe-configure-stagefeedback-libctf: configure-stagefeedback-libctf
+configure-stagefeedback-libctf:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(TARGET_SUBDIR)/libstdc++-v3; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       module_srcdir=libctf; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif libctf-bootstrap
 
-.PHONY: configure-stageautoprofile-target-libstdc++-v3 maybe-configure-stageautoprofile-target-libstdc++-v3
-maybe-configure-stageautoprofile-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stageautoprofile-target-libstdc++-v3: configure-stageautoprofile-target-libstdc++-v3
-configure-stageautoprofile-target-libstdc++-v3:
+.PHONY: configure-stageautoprofile-libctf maybe-configure-stageautoprofile-libctf
+maybe-configure-stageautoprofile-libctf:
+@if libctf-bootstrap
+maybe-configure-stageautoprofile-libctf: configure-stageautoprofile-libctf
+configure-stageautoprofile-libctf:
        @[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libstdc++-v3; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage autoprofile in $(HOST_SUBDIR)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       module_srcdir=libctf; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif libctf-bootstrap
 
-.PHONY: configure-stageautofeedback-target-libstdc++-v3 maybe-configure-stageautofeedback-target-libstdc++-v3
-maybe-configure-stageautofeedback-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stageautofeedback-target-libstdc++-v3: configure-stageautofeedback-target-libstdc++-v3
-configure-stageautofeedback-target-libstdc++-v3:
+.PHONY: configure-stageautofeedback-libctf maybe-configure-stageautofeedback-libctf
+maybe-configure-stageautofeedback-libctf:
+@if libctf-bootstrap
+maybe-configure-stageautofeedback-libctf: configure-stageautofeedback-libctf
+configure-stageautofeedback-libctf:
        @[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libstdc++-v3; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage autofeedback in $(HOST_SUBDIR)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       module_srcdir=libctf; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif libctf-bootstrap
 
 
 
 
 
-.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
-maybe-all-target-libstdc++-v3:
+.PHONY: all-libctf maybe-all-libctf
+maybe-all-libctf:
 @if gcc-bootstrap
-all-target-libstdc++-v3: stage_current
+all-libctf: stage_current
 @endif gcc-bootstrap
-@if target-libstdc++-v3
-TARGET-target-libstdc++-v3=all
-maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
-all-target-libstdc++-v3: configure-target-libstdc++-v3
+@if libctf
+TARGET-libctf=all
+maybe-all-libctf: all-libctf
+all-libctf: configure-libctf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-               $(TARGET-target-libstdc++-v3))
-@endif target-libstdc++-v3
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libctf && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libctf))
+@endif libctf
 
 
 
-.PHONY: all-stage1-target-libstdc++-v3 maybe-all-stage1-target-libstdc++-v3
-.PHONY: clean-stage1-target-libstdc++-v3 maybe-clean-stage1-target-libstdc++-v3
-maybe-all-stage1-target-libstdc++-v3:
-maybe-clean-stage1-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stage1-target-libstdc++-v3: all-stage1-target-libstdc++-v3
-all-stage1: all-stage1-target-libstdc++-v3
-TARGET-stage1-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
+.PHONY: all-stage1-libctf maybe-all-stage1-libctf
+.PHONY: clean-stage1-libctf maybe-clean-stage1-libctf
+maybe-all-stage1-libctf:
+maybe-clean-stage1-libctf:
+@if libctf-bootstrap
+maybe-all-stage1-libctf: all-stage1-libctf
+all-stage1: all-stage1-libctf
+TARGET-stage1-libctf = $(TARGET-libctf)
+all-stage1-libctf: configure-stage1-libctf
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS)  \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libctf && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS="$(STAGE1_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
+               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+               LIBCFLAGS="$(LIBCFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-                 \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)"  \
-               $(TARGET-stage1-target-libstdc++-v3)
+               $(TARGET-stage1-libctf)
 
-maybe-clean-stage1-target-libstdc++-v3: clean-stage1-target-libstdc++-v3
-clean-stage1: clean-stage1-target-libstdc++-v3
-clean-stage1-target-libstdc++-v3:
+maybe-clean-stage1-libctf: clean-stage1-libctf
+clean-stage1: clean-stage1-libctf
+clean-stage1-libctf:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-libctf/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-         clean
-@endif target-libstdc++-v3-bootstrap
-
-
-.PHONY: all-stage2-target-libstdc++-v3 maybe-all-stage2-target-libstdc++-v3
-.PHONY: clean-stage2-target-libstdc++-v3 maybe-clean-stage2-target-libstdc++-v3
-maybe-all-stage2-target-libstdc++-v3:
-maybe-clean-stage2-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stage2-target-libstdc++-v3: all-stage2-target-libstdc++-v3
-all-stage2: all-stage2-target-libstdc++-v3
-TARGET-stage2-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stage2-libctf maybe-all-stage2-libctf
+.PHONY: clean-stage2-libctf maybe-clean-stage2-libctf
+maybe-all-stage2-libctf:
+maybe-clean-stage2-libctf:
+@if libctf-bootstrap
+maybe-all-stage2-libctf: all-stage2-libctf
+all-stage2: all-stage2-libctf
+TARGET-stage2-libctf = $(TARGET-libctf)
+all-stage2-libctf: configure-stage2-libctf
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libctf && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS="$(STAGE2_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
+               CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE2_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)"  \
-               $(TARGET-stage2-target-libstdc++-v3)
+               $(TARGET-stage2-libctf)
 
-maybe-clean-stage2-target-libstdc++-v3: clean-stage2-target-libstdc++-v3
-clean-stage2: clean-stage2-target-libstdc++-v3
-clean-stage2-target-libstdc++-v3:
+maybe-clean-stage2-libctf: clean-stage2-libctf
+clean-stage2: clean-stage2-libctf
+clean-stage2-libctf:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-libctf/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
-
-
-.PHONY: all-stage3-target-libstdc++-v3 maybe-all-stage3-target-libstdc++-v3
-.PHONY: clean-stage3-target-libstdc++-v3 maybe-clean-stage3-target-libstdc++-v3
-maybe-all-stage3-target-libstdc++-v3:
-maybe-clean-stage3-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stage3-target-libstdc++-v3: all-stage3-target-libstdc++-v3
-all-stage3: all-stage3-target-libstdc++-v3
-TARGET-stage3-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stage3-libctf maybe-all-stage3-libctf
+.PHONY: clean-stage3-libctf maybe-clean-stage3-libctf
+maybe-all-stage3-libctf:
+maybe-clean-stage3-libctf:
+@if libctf-bootstrap
+maybe-all-stage3-libctf: all-stage3-libctf
+all-stage3: all-stage3-libctf
+TARGET-stage3-libctf = $(TARGET-libctf)
+all-stage3-libctf: configure-stage3-libctf
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libctf && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS="$(STAGE3_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
+               CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE3_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)"  \
-               $(TARGET-stage3-target-libstdc++-v3)
+               $(TARGET-stage3-libctf)
 
-maybe-clean-stage3-target-libstdc++-v3: clean-stage3-target-libstdc++-v3
-clean-stage3: clean-stage3-target-libstdc++-v3
-clean-stage3-target-libstdc++-v3:
+maybe-clean-stage3-libctf: clean-stage3-libctf
+clean-stage3: clean-stage3-libctf
+clean-stage3-libctf:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-libctf/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
-
-
-.PHONY: all-stage4-target-libstdc++-v3 maybe-all-stage4-target-libstdc++-v3
-.PHONY: clean-stage4-target-libstdc++-v3 maybe-clean-stage4-target-libstdc++-v3
-maybe-all-stage4-target-libstdc++-v3:
-maybe-clean-stage4-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stage4-target-libstdc++-v3: all-stage4-target-libstdc++-v3
-all-stage4: all-stage4-target-libstdc++-v3
-TARGET-stage4-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stage4-libctf maybe-all-stage4-libctf
+.PHONY: clean-stage4-libctf maybe-clean-stage4-libctf
+maybe-all-stage4-libctf:
+maybe-clean-stage4-libctf:
+@if libctf-bootstrap
+maybe-all-stage4-libctf: all-stage4-libctf
+all-stage4: all-stage4-libctf
+TARGET-stage4-libctf = $(TARGET-libctf)
+all-stage4-libctf: configure-stage4-libctf
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libctf && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE4_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)"  \
-               $(TARGET-stage4-target-libstdc++-v3)
+               $(TARGET-stage4-libctf)
 
-maybe-clean-stage4-target-libstdc++-v3: clean-stage4-target-libstdc++-v3
-clean-stage4: clean-stage4-target-libstdc++-v3
-clean-stage4-target-libstdc++-v3:
+maybe-clean-stage4-libctf: clean-stage4-libctf
+clean-stage4: clean-stage4-libctf
+clean-stage4-libctf:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-libctf/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
-
-
-.PHONY: all-stageprofile-target-libstdc++-v3 maybe-all-stageprofile-target-libstdc++-v3
-.PHONY: clean-stageprofile-target-libstdc++-v3 maybe-clean-stageprofile-target-libstdc++-v3
-maybe-all-stageprofile-target-libstdc++-v3:
-maybe-clean-stageprofile-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stageprofile-target-libstdc++-v3: all-stageprofile-target-libstdc++-v3
-all-stageprofile: all-stageprofile-target-libstdc++-v3
-TARGET-stageprofile-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stageprofile-libctf maybe-all-stageprofile-libctf
+.PHONY: clean-stageprofile-libctf maybe-clean-stageprofile-libctf
+maybe-all-stageprofile-libctf:
+maybe-clean-stageprofile-libctf:
+@if libctf-bootstrap
+maybe-all-stageprofile-libctf: all-stageprofile-libctf
+all-stageprofile: all-stageprofile-libctf
+TARGET-stageprofile-libctf = $(TARGET-libctf)
+all-stageprofile-libctf: configure-stageprofile-libctf
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libctf && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS="$(STAGEprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
+               CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)"  \
-               $(TARGET-stageprofile-target-libstdc++-v3)
+               $(TARGET-stageprofile-libctf)
 
-maybe-clean-stageprofile-target-libstdc++-v3: clean-stageprofile-target-libstdc++-v3
-clean-stageprofile: clean-stageprofile-target-libstdc++-v3
-clean-stageprofile-target-libstdc++-v3:
+maybe-clean-stageprofile-libctf: clean-stageprofile-libctf
+clean-stageprofile: clean-stageprofile-libctf
+clean-stageprofile-libctf:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-libctf/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
-
-
-.PHONY: all-stagetrain-target-libstdc++-v3 maybe-all-stagetrain-target-libstdc++-v3
-.PHONY: clean-stagetrain-target-libstdc++-v3 maybe-clean-stagetrain-target-libstdc++-v3
-maybe-all-stagetrain-target-libstdc++-v3:
-maybe-clean-stagetrain-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stagetrain-target-libstdc++-v3: all-stagetrain-target-libstdc++-v3
-all-stagetrain: all-stagetrain-target-libstdc++-v3
-TARGET-stagetrain-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stagetrain-target-libstdc++-v3: configure-stagetrain-target-libstdc++-v3
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stagetrain-libctf maybe-all-stagetrain-libctf
+.PHONY: clean-stagetrain-libctf maybe-clean-stagetrain-libctf
+maybe-all-stagetrain-libctf:
+maybe-clean-stagetrain-libctf:
+@if libctf-bootstrap
+maybe-all-stagetrain-libctf: all-stagetrain-libctf
+all-stagetrain: all-stagetrain-libctf
+TARGET-stagetrain-libctf = $(TARGET-libctf)
+all-stagetrain-libctf: configure-stagetrain-libctf
        @[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEtrain_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libctf && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS="$(STAGEtrain_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
+               CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEtrain_TFLAGS)"  \
-               $(TARGET-stagetrain-target-libstdc++-v3)
+               $(TARGET-stagetrain-libctf)
 
-maybe-clean-stagetrain-target-libstdc++-v3: clean-stagetrain-target-libstdc++-v3
-clean-stagetrain: clean-stagetrain-target-libstdc++-v3
-clean-stagetrain-target-libstdc++-v3:
+maybe-clean-stagetrain-libctf: clean-stagetrain-libctf
+clean-stagetrain: clean-stagetrain-libctf
+clean-stagetrain-libctf:
        @if [ $(current_stage) = stagetrain ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stagetrain-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagetrain-libctf/Makefile ] || exit 0; \
          $(MAKE) stagetrain-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
-
-
-.PHONY: all-stagefeedback-target-libstdc++-v3 maybe-all-stagefeedback-target-libstdc++-v3
-.PHONY: clean-stagefeedback-target-libstdc++-v3 maybe-clean-stagefeedback-target-libstdc++-v3
-maybe-all-stagefeedback-target-libstdc++-v3:
-maybe-clean-stagefeedback-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stagefeedback-target-libstdc++-v3: all-stagefeedback-target-libstdc++-v3
-all-stagefeedback: all-stagefeedback-target-libstdc++-v3
-TARGET-stagefeedback-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stagefeedback-libctf maybe-all-stagefeedback-libctf
+.PHONY: clean-stagefeedback-libctf maybe-clean-stagefeedback-libctf
+maybe-all-stagefeedback-libctf:
+maybe-clean-stagefeedback-libctf:
+@if libctf-bootstrap
+maybe-all-stagefeedback-libctf: all-stagefeedback-libctf
+all-stagefeedback: all-stagefeedback-libctf
+TARGET-stagefeedback-libctf = $(TARGET-libctf)
+all-stagefeedback-libctf: configure-stagefeedback-libctf
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libctf && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
+               CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)"  \
-               $(TARGET-stagefeedback-target-libstdc++-v3)
+               $(TARGET-stagefeedback-libctf)
 
-maybe-clean-stagefeedback-target-libstdc++-v3: clean-stagefeedback-target-libstdc++-v3
-clean-stagefeedback: clean-stagefeedback-target-libstdc++-v3
-clean-stagefeedback-target-libstdc++-v3:
+maybe-clean-stagefeedback-libctf: clean-stagefeedback-libctf
+clean-stagefeedback: clean-stagefeedback-libctf
+clean-stagefeedback-libctf:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libctf/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
-
-
-.PHONY: all-stageautoprofile-target-libstdc++-v3 maybe-all-stageautoprofile-target-libstdc++-v3
-.PHONY: clean-stageautoprofile-target-libstdc++-v3 maybe-clean-stageautoprofile-target-libstdc++-v3
-maybe-all-stageautoprofile-target-libstdc++-v3:
-maybe-clean-stageautoprofile-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stageautoprofile-target-libstdc++-v3: all-stageautoprofile-target-libstdc++-v3
-all-stageautoprofile: all-stageautoprofile-target-libstdc++-v3
-TARGET-stageautoprofile-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stageautoprofile-target-libstdc++-v3: configure-stageautoprofile-target-libstdc++-v3
+       fi; \
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stageautoprofile-libctf maybe-all-stageautoprofile-libctf
+.PHONY: clean-stageautoprofile-libctf maybe-clean-stageautoprofile-libctf
+maybe-all-stageautoprofile-libctf:
+maybe-clean-stageautoprofile-libctf:
+@if libctf-bootstrap
+maybe-all-stageautoprofile-libctf: all-stageautoprofile-libctf
+all-stageautoprofile: all-stageautoprofile-libctf
+TARGET-stageautoprofile-libctf = $(TARGET-libctf)
+all-stageautoprofile-libctf: configure-stageautoprofile-libctf
        @[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libctf && \
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS="$(STAGEautoprofile_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
+               CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-               $(TARGET-stageautoprofile-target-libstdc++-v3)
+               $(TARGET-stageautoprofile-libctf)
 
-maybe-clean-stageautoprofile-target-libstdc++-v3: clean-stageautoprofile-target-libstdc++-v3
-clean-stageautoprofile: clean-stageautoprofile-target-libstdc++-v3
-clean-stageautoprofile-target-libstdc++-v3:
+maybe-clean-stageautoprofile-libctf: clean-stageautoprofile-libctf
+clean-stageautoprofile: clean-stageautoprofile-libctf
+clean-stageautoprofile-libctf:
        @if [ $(current_stage) = stageautoprofile ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stageautoprofile-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageautoprofile-libctf/Makefile ] || exit 0; \
          $(MAKE) stageautoprofile-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
-
-
-.PHONY: all-stageautofeedback-target-libstdc++-v3 maybe-all-stageautofeedback-target-libstdc++-v3
-.PHONY: clean-stageautofeedback-target-libstdc++-v3 maybe-clean-stageautofeedback-target-libstdc++-v3
-maybe-all-stageautofeedback-target-libstdc++-v3:
-maybe-clean-stageautofeedback-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stageautofeedback-target-libstdc++-v3: all-stageautofeedback-target-libstdc++-v3
-all-stageautofeedback: all-stageautofeedback-target-libstdc++-v3
-TARGET-stageautofeedback-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stageautofeedback-target-libstdc++-v3: configure-stageautofeedback-target-libstdc++-v3
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stageautofeedback-libctf maybe-all-stageautofeedback-libctf
+.PHONY: clean-stageautofeedback-libctf maybe-clean-stageautofeedback-libctf
+maybe-all-stageautofeedback-libctf:
+maybe-clean-stageautofeedback-libctf:
+@if libctf-bootstrap
+maybe-all-stageautofeedback-libctf: all-stageautofeedback-libctf
+all-stageautofeedback: all-stageautofeedback-libctf
+TARGET-stageautofeedback-libctf = $(TARGET-libctf)
+all-stageautofeedback-libctf: configure-stageautofeedback-libctf
        @[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libctf && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS="$(STAGEautofeedback_CFLAGS)" \
+               GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
+               CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-               $(TARGET-stageautofeedback-target-libstdc++-v3)
+               $(TARGET-stageautofeedback-libctf)
 
-maybe-clean-stageautofeedback-target-libstdc++-v3: clean-stageautofeedback-target-libstdc++-v3
-clean-stageautofeedback: clean-stageautofeedback-target-libstdc++-v3
-clean-stageautofeedback-target-libstdc++-v3:
+maybe-clean-stageautofeedback-libctf: clean-stageautofeedback-libctf
+clean-stageautofeedback: clean-stageautofeedback-libctf
+clean-stageautofeedback-libctf:
        @if [ $(current_stage) = stageautofeedback ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stageautofeedback-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageautofeedback-libctf/Makefile ] || exit 0; \
          $(MAKE) stageautofeedback-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
-
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
 
 
 
 
 
-.PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
-maybe-check-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
+.PHONY: check-libctf maybe-check-libctf
+maybe-check-libctf:
+@if libctf
+maybe-check-libctf: check-libctf
 
-check-target-libstdc++-v3:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
+check-libctf:
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
-maybe-install-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
+.PHONY: install-libctf maybe-install-libctf
+maybe-install-libctf:
+@if libctf
+maybe-install-libctf: install-libctf
 
-install-target-libstdc++-v3: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+install-libctf:
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: install-strip-target-libstdc++-v3 maybe-install-strip-target-libstdc++-v3
-maybe-install-strip-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-strip-target-libstdc++-v3: install-strip-target-libstdc++-v3
+.PHONY: install-strip-libctf maybe-install-strip-libctf
+maybe-install-strip-libctf:
+@if libctf
+maybe-install-strip-libctf: install-strip-libctf
 
-install-strip-target-libstdc++-v3: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+install-strip-libctf:
 
-@endif target-libstdc++-v3
+@endif libctf
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libstdc++-v3 info-target-libstdc++-v3
-maybe-info-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
+.PHONY: maybe-info-libctf info-libctf
+maybe-info-libctf:
+@if libctf
+maybe-info-libctf: info-libctf
 
-info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+info-libctf: \
+    configure-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing info in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  info) \
+                 info) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: maybe-dvi-target-libstdc++-v3 dvi-target-libstdc++-v3
-maybe-dvi-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
+.PHONY: maybe-dvi-libctf dvi-libctf
+maybe-dvi-libctf:
+@if libctf
+maybe-dvi-libctf: dvi-libctf
 
-dvi-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+dvi-libctf: \
+    configure-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing dvi in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  dvi) \
+                 dvi) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: maybe-pdf-target-libstdc++-v3 pdf-target-libstdc++-v3
-maybe-pdf-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-pdf-target-libstdc++-v3: pdf-target-libstdc++-v3
+.PHONY: maybe-pdf-libctf pdf-libctf
+maybe-pdf-libctf:
+@if libctf
+maybe-pdf-libctf: pdf-libctf
 
-pdf-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+pdf-libctf: \
+    configure-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing pdf in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  pdf) \
+                 pdf) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3
-maybe-html-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
+.PHONY: maybe-html-libctf html-libctf
+maybe-html-libctf:
+@if libctf
+maybe-html-libctf: html-libctf
 
-html-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+html-libctf: \
+    configure-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing html in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  html) \
+                 html) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
+.PHONY: maybe-TAGS-libctf TAGS-libctf
+maybe-TAGS-libctf:
+@if libctf
+maybe-TAGS-libctf: TAGS-libctf
 
-TAGS-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+TAGS-libctf: \
+    configure-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing TAGS in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  TAGS) \
+                 TAGS) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3
-maybe-install-info-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
+.PHONY: maybe-install-info-libctf install-info-libctf
+maybe-install-info-libctf:
+@if libctf
+maybe-install-info-libctf: install-info-libctf
 
-install-info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    info-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+install-info-libctf: \
+    configure-libctf \
+    info-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing install-info in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  install-info) \
+                 install-info) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: maybe-install-pdf-target-libstdc++-v3 install-pdf-target-libstdc++-v3
-maybe-install-pdf-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-pdf-target-libstdc++-v3: install-pdf-target-libstdc++-v3
+.PHONY: maybe-install-pdf-libctf install-pdf-libctf
+maybe-install-pdf-libctf:
+@if libctf
+maybe-install-pdf-libctf: install-pdf-libctf
 
-install-pdf-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    pdf-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+install-pdf-libctf: \
+    configure-libctf \
+    pdf-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing install-pdf in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  install-pdf) \
+                 install-pdf) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: maybe-install-html-target-libstdc++-v3 install-html-target-libstdc++-v3
-maybe-install-html-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-html-target-libstdc++-v3: install-html-target-libstdc++-v3
+.PHONY: maybe-install-html-libctf install-html-libctf
+maybe-install-html-libctf:
+@if libctf
+maybe-install-html-libctf: install-html-libctf
 
-install-html-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    html-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+install-html-libctf: \
+    configure-libctf \
+    html-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing install-html in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  install-html) \
+                 install-html) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3
-maybe-installcheck-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
+.PHONY: maybe-installcheck-libctf installcheck-libctf
+maybe-installcheck-libctf:
+@if libctf
+maybe-installcheck-libctf: installcheck-libctf
 
-installcheck-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+installcheck-libctf: \
+    configure-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing installcheck in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  installcheck) \
+                 installcheck) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: maybe-mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3
-maybe-mostlyclean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
+.PHONY: maybe-mostlyclean-libctf mostlyclean-libctf
+maybe-mostlyclean-libctf:
+@if libctf
+maybe-mostlyclean-libctf: mostlyclean-libctf
 
-mostlyclean-target-libstdc++-v3: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+mostlyclean-libctf: 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing mostlyclean in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  mostlyclean) \
+                 mostlyclean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: maybe-clean-target-libstdc++-v3 clean-target-libstdc++-v3
-maybe-clean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
+.PHONY: maybe-clean-libctf clean-libctf
+maybe-clean-libctf:
+@if libctf
+maybe-clean-libctf: clean-libctf
 
-clean-target-libstdc++-v3: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+clean-libctf: 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing clean in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  clean) \
+                 clean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: maybe-distclean-target-libstdc++-v3 distclean-target-libstdc++-v3
-maybe-distclean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
+.PHONY: maybe-distclean-libctf distclean-libctf
+maybe-distclean-libctf:
+@if libctf
+maybe-distclean-libctf: distclean-libctf
 
-distclean-target-libstdc++-v3: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+distclean-libctf: 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing distclean in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  distclean) \
+                 distclean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
-.PHONY: maybe-maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3
-maybe-maintainer-clean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
+.PHONY: maybe-maintainer-clean-libctf maintainer-clean-libctf
+maybe-maintainer-clean-libctf:
+@if libctf
+maybe-maintainer-clean-libctf: maintainer-clean-libctf
 
-maintainer-clean-target-libstdc++-v3: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+maintainer-clean-libctf: 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing maintainer-clean in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  maintainer-clean) \
+                 maintainer-clean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif libctf
 
 
 
+# ---------------------------------------
+# Modules which run on the target machine
+# ---------------------------------------
 
 
-.PHONY: configure-target-libsanitizer maybe-configure-target-libsanitizer
-maybe-configure-target-libsanitizer:
+
+
+.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
+maybe-configure-target-libstdc++-v3:
 @if gcc-bootstrap
-configure-target-libsanitizer: stage_current
+configure-target-libstdc++-v3: stage_current
 @endif gcc-bootstrap
-@if target-libsanitizer
-maybe-configure-target-libsanitizer: configure-target-libsanitizer
-configure-target-libsanitizer: 
+@if target-libstdc++-v3
+maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
+configure-target-libstdc++-v3: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
        $(RAW_CXX_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libsanitizer; \
-       cd "$(TARGET_SUBDIR)/libsanitizer" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libstdc++-v3; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) \
          $$s/$$module_srcdir/configure \
@@ -39163,452 +39734,452 @@ configure-target-libsanitizer:
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
 
 
-.PHONY: configure-stage1-target-libsanitizer maybe-configure-stage1-target-libsanitizer
-maybe-configure-stage1-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
-configure-stage1-target-libsanitizer:
+.PHONY: configure-stage1-target-libstdc++-v3 maybe-configure-stage1-target-libstdc++-v3
+maybe-configure-stage1-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
+configure-stage1-target-libstdc++-v3:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
        $(RAW_CXX_TARGET_EXPORTS) \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(TARGET_SUBDIR)/libsanitizer; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libstdc++-v3; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
           \
          $(STAGE1_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
-.PHONY: configure-stage2-target-libsanitizer maybe-configure-stage2-target-libsanitizer
-maybe-configure-stage2-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
-configure-stage2-target-libsanitizer:
+.PHONY: configure-stage2-target-libstdc++-v3 maybe-configure-stage2-target-libstdc++-v3
+maybe-configure-stage2-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
+configure-stage2-target-libstdc++-v3:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
        $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(TARGET_SUBDIR)/libsanitizer; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libstdc++-v3; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
-.PHONY: configure-stage3-target-libsanitizer maybe-configure-stage3-target-libsanitizer
-maybe-configure-stage3-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
-configure-stage3-target-libsanitizer:
+.PHONY: configure-stage3-target-libstdc++-v3 maybe-configure-stage3-target-libstdc++-v3
+maybe-configure-stage3-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
+configure-stage3-target-libstdc++-v3:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
        $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(TARGET_SUBDIR)/libsanitizer; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libstdc++-v3; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
-.PHONY: configure-stage4-target-libsanitizer maybe-configure-stage4-target-libsanitizer
-maybe-configure-stage4-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
-configure-stage4-target-libsanitizer:
+.PHONY: configure-stage4-target-libstdc++-v3 maybe-configure-stage4-target-libstdc++-v3
+maybe-configure-stage4-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
+configure-stage4-target-libstdc++-v3:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
        $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(TARGET_SUBDIR)/libsanitizer; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libstdc++-v3; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
-.PHONY: configure-stageprofile-target-libsanitizer maybe-configure-stageprofile-target-libsanitizer
-maybe-configure-stageprofile-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
-configure-stageprofile-target-libsanitizer:
+.PHONY: configure-stageprofile-target-libstdc++-v3 maybe-configure-stageprofile-target-libstdc++-v3
+maybe-configure-stageprofile-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
+configure-stageprofile-target-libstdc++-v3:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
        $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(TARGET_SUBDIR)/libsanitizer; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libstdc++-v3; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
-.PHONY: configure-stagetrain-target-libsanitizer maybe-configure-stagetrain-target-libsanitizer
-maybe-configure-stagetrain-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stagetrain-target-libsanitizer: configure-stagetrain-target-libsanitizer
-configure-stagetrain-target-libsanitizer:
+.PHONY: configure-stagetrain-target-libstdc++-v3 maybe-configure-stagetrain-target-libstdc++-v3
+maybe-configure-stagetrain-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stagetrain-target-libstdc++-v3: configure-stagetrain-target-libstdc++-v3
+configure-stagetrain-target-libstdc++-v3:
        @[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEtrain_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
        $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage train in $(TARGET_SUBDIR)/libsanitizer; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage train in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libstdc++-v3; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEtrain_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
-.PHONY: configure-stagefeedback-target-libsanitizer maybe-configure-stagefeedback-target-libsanitizer
-maybe-configure-stagefeedback-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer
-configure-stagefeedback-target-libsanitizer:
+.PHONY: configure-stagefeedback-target-libstdc++-v3 maybe-configure-stagefeedback-target-libstdc++-v3
+maybe-configure-stagefeedback-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3
+configure-stagefeedback-target-libstdc++-v3:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
        $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(TARGET_SUBDIR)/libsanitizer; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libstdc++-v3; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
-.PHONY: configure-stageautoprofile-target-libsanitizer maybe-configure-stageautoprofile-target-libsanitizer
-maybe-configure-stageautoprofile-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stageautoprofile-target-libsanitizer: configure-stageautoprofile-target-libsanitizer
-configure-stageautoprofile-target-libsanitizer:
+.PHONY: configure-stageautoprofile-target-libstdc++-v3 maybe-configure-stageautoprofile-target-libstdc++-v3
+maybe-configure-stageautoprofile-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stageautoprofile-target-libstdc++-v3: configure-stageautoprofile-target-libstdc++-v3
+configure-stageautoprofile-target-libstdc++-v3:
        @[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
        $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libsanitizer; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libstdc++-v3; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
-.PHONY: configure-stageautofeedback-target-libsanitizer maybe-configure-stageautofeedback-target-libsanitizer
-maybe-configure-stageautofeedback-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stageautofeedback-target-libsanitizer: configure-stageautofeedback-target-libsanitizer
-configure-stageautofeedback-target-libsanitizer:
+.PHONY: configure-stageautofeedback-target-libstdc++-v3 maybe-configure-stageautofeedback-target-libstdc++-v3
+maybe-configure-stageautofeedback-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stageautofeedback-target-libstdc++-v3: configure-stageautofeedback-target-libstdc++-v3
+configure-stageautofeedback-target-libstdc++-v3:
        @[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
        $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libsanitizer; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libstdc++-v3; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
 
 
 
 
-.PHONY: all-target-libsanitizer maybe-all-target-libsanitizer
-maybe-all-target-libsanitizer:
+.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
+maybe-all-target-libstdc++-v3:
 @if gcc-bootstrap
-all-target-libsanitizer: stage_current
+all-target-libstdc++-v3: stage_current
 @endif gcc-bootstrap
-@if target-libsanitizer
-TARGET-target-libsanitizer=all
-maybe-all-target-libsanitizer: all-target-libsanitizer
-all-target-libsanitizer: configure-target-libsanitizer
+@if target-libstdc++-v3
+TARGET-target-libstdc++-v3=all
+maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
+all-target-libstdc++-v3: configure-target-libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-               $(TARGET-target-libsanitizer))
-@endif target-libsanitizer
+               $(TARGET-target-libstdc++-v3))
+@endif target-libstdc++-v3
 
 
 
-.PHONY: all-stage1-target-libsanitizer maybe-all-stage1-target-libsanitizer
-.PHONY: clean-stage1-target-libsanitizer maybe-clean-stage1-target-libsanitizer
-maybe-all-stage1-target-libsanitizer:
-maybe-clean-stage1-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stage1-target-libsanitizer: all-stage1-target-libsanitizer
-all-stage1: all-stage1-target-libsanitizer
-TARGET-stage1-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
+.PHONY: all-stage1-target-libstdc++-v3 maybe-all-stage1-target-libstdc++-v3
+.PHONY: clean-stage1-target-libstdc++-v3 maybe-clean-stage1-target-libstdc++-v3
+maybe-all-stage1-target-libstdc++-v3:
+maybe-clean-stage1-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage1-target-libstdc++-v3: all-stage1-target-libstdc++-v3
+all-stage1: all-stage1-target-libstdc++-v3
+TARGET-stage1-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
        $(RAW_CXX_TARGET_EXPORTS)  \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -39620,39 +40191,39 @@ all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
                $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
                  \
                TFLAGS="$(STAGE1_TFLAGS)"  \
-               $(TARGET-stage1-target-libsanitizer)
+               $(TARGET-stage1-target-libstdc++-v3)
 
-maybe-clean-stage1-target-libsanitizer: clean-stage1-target-libsanitizer
-clean-stage1: clean-stage1-target-libsanitizer
-clean-stage1-target-libsanitizer:
+maybe-clean-stage1-target-libstdc++-v3: clean-stage1-target-libstdc++-v3
+clean-stage1: clean-stage1-target-libstdc++-v3
+clean-stage1-target-libstdc++-v3:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage1-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
          clean
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
 
-.PHONY: all-stage2-target-libsanitizer maybe-all-stage2-target-libsanitizer
-.PHONY: clean-stage2-target-libsanitizer maybe-clean-stage2-target-libsanitizer
-maybe-all-stage2-target-libsanitizer:
-maybe-clean-stage2-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stage2-target-libsanitizer: all-stage2-target-libsanitizer
-all-stage2: all-stage2-target-libsanitizer
-TARGET-stage2-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
+.PHONY: all-stage2-target-libstdc++-v3 maybe-all-stage2-target-libstdc++-v3
+.PHONY: clean-stage2-target-libstdc++-v3 maybe-clean-stage2-target-libstdc++-v3
+maybe-all-stage2-target-libstdc++-v3:
+maybe-clean-stage2-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage2-target-libstdc++-v3: all-stage2-target-libstdc++-v3
+all-stage2: all-stage2-target-libstdc++-v3
+TARGET-stage2-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -39663,38 +40234,38 @@ all-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGE2_TFLAGS)"  \
-               $(TARGET-stage2-target-libsanitizer)
+               $(TARGET-stage2-target-libstdc++-v3)
 
-maybe-clean-stage2-target-libsanitizer: clean-stage2-target-libsanitizer
-clean-stage2: clean-stage2-target-libsanitizer
-clean-stage2-target-libsanitizer:
+maybe-clean-stage2-target-libstdc++-v3: clean-stage2-target-libstdc++-v3
+clean-stage2: clean-stage2-target-libstdc++-v3
+clean-stage2-target-libstdc++-v3:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage2-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
 
-.PHONY: all-stage3-target-libsanitizer maybe-all-stage3-target-libsanitizer
-.PHONY: clean-stage3-target-libsanitizer maybe-clean-stage3-target-libsanitizer
-maybe-all-stage3-target-libsanitizer:
-maybe-clean-stage3-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stage3-target-libsanitizer: all-stage3-target-libsanitizer
-all-stage3: all-stage3-target-libsanitizer
-TARGET-stage3-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
+.PHONY: all-stage3-target-libstdc++-v3 maybe-all-stage3-target-libstdc++-v3
+.PHONY: clean-stage3-target-libstdc++-v3 maybe-clean-stage3-target-libstdc++-v3
+maybe-all-stage3-target-libstdc++-v3:
+maybe-clean-stage3-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage3-target-libstdc++-v3: all-stage3-target-libstdc++-v3
+all-stage3: all-stage3-target-libstdc++-v3
+TARGET-stage3-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -39705,38 +40276,38 @@ all-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGE3_TFLAGS)"  \
-               $(TARGET-stage3-target-libsanitizer)
+               $(TARGET-stage3-target-libstdc++-v3)
 
-maybe-clean-stage3-target-libsanitizer: clean-stage3-target-libsanitizer
-clean-stage3: clean-stage3-target-libsanitizer
-clean-stage3-target-libsanitizer:
+maybe-clean-stage3-target-libstdc++-v3: clean-stage3-target-libstdc++-v3
+clean-stage3: clean-stage3-target-libstdc++-v3
+clean-stage3-target-libstdc++-v3:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage3-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
 
-.PHONY: all-stage4-target-libsanitizer maybe-all-stage4-target-libsanitizer
-.PHONY: clean-stage4-target-libsanitizer maybe-clean-stage4-target-libsanitizer
-maybe-all-stage4-target-libsanitizer:
-maybe-clean-stage4-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stage4-target-libsanitizer: all-stage4-target-libsanitizer
-all-stage4: all-stage4-target-libsanitizer
-TARGET-stage4-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
+.PHONY: all-stage4-target-libstdc++-v3 maybe-all-stage4-target-libstdc++-v3
+.PHONY: clean-stage4-target-libstdc++-v3 maybe-clean-stage4-target-libstdc++-v3
+maybe-all-stage4-target-libstdc++-v3:
+maybe-clean-stage4-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage4-target-libstdc++-v3: all-stage4-target-libstdc++-v3
+all-stage4: all-stage4-target-libstdc++-v3
+TARGET-stage4-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -39747,38 +40318,38 @@ all-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGE4_TFLAGS)"  \
-               $(TARGET-stage4-target-libsanitizer)
+               $(TARGET-stage4-target-libstdc++-v3)
 
-maybe-clean-stage4-target-libsanitizer: clean-stage4-target-libsanitizer
-clean-stage4: clean-stage4-target-libsanitizer
-clean-stage4-target-libsanitizer:
+maybe-clean-stage4-target-libstdc++-v3: clean-stage4-target-libstdc++-v3
+clean-stage4: clean-stage4-target-libstdc++-v3
+clean-stage4-target-libstdc++-v3:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage4-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
 
-.PHONY: all-stageprofile-target-libsanitizer maybe-all-stageprofile-target-libsanitizer
-.PHONY: clean-stageprofile-target-libsanitizer maybe-clean-stageprofile-target-libsanitizer
-maybe-all-stageprofile-target-libsanitizer:
-maybe-clean-stageprofile-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stageprofile-target-libsanitizer: all-stageprofile-target-libsanitizer
-all-stageprofile: all-stageprofile-target-libsanitizer
-TARGET-stageprofile-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
+.PHONY: all-stageprofile-target-libstdc++-v3 maybe-all-stageprofile-target-libstdc++-v3
+.PHONY: clean-stageprofile-target-libstdc++-v3 maybe-clean-stageprofile-target-libstdc++-v3
+maybe-all-stageprofile-target-libstdc++-v3:
+maybe-clean-stageprofile-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stageprofile-target-libstdc++-v3: all-stageprofile-target-libstdc++-v3
+all-stageprofile: all-stageprofile-target-libstdc++-v3
+TARGET-stageprofile-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -39789,38 +40360,38 @@ all-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGEprofile_TFLAGS)"  \
-               $(TARGET-stageprofile-target-libsanitizer)
+               $(TARGET-stageprofile-target-libstdc++-v3)
 
-maybe-clean-stageprofile-target-libsanitizer: clean-stageprofile-target-libsanitizer
-clean-stageprofile: clean-stageprofile-target-libsanitizer
-clean-stageprofile-target-libsanitizer:
+maybe-clean-stageprofile-target-libstdc++-v3: clean-stageprofile-target-libstdc++-v3
+clean-stageprofile: clean-stageprofile-target-libstdc++-v3
+clean-stageprofile-target-libstdc++-v3:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stageprofile-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
 
-.PHONY: all-stagetrain-target-libsanitizer maybe-all-stagetrain-target-libsanitizer
-.PHONY: clean-stagetrain-target-libsanitizer maybe-clean-stagetrain-target-libsanitizer
-maybe-all-stagetrain-target-libsanitizer:
-maybe-clean-stagetrain-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stagetrain-target-libsanitizer: all-stagetrain-target-libsanitizer
-all-stagetrain: all-stagetrain-target-libsanitizer
-TARGET-stagetrain-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stagetrain-target-libsanitizer: configure-stagetrain-target-libsanitizer
+.PHONY: all-stagetrain-target-libstdc++-v3 maybe-all-stagetrain-target-libstdc++-v3
+.PHONY: clean-stagetrain-target-libstdc++-v3 maybe-clean-stagetrain-target-libstdc++-v3
+maybe-all-stagetrain-target-libstdc++-v3:
+maybe-clean-stagetrain-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stagetrain-target-libstdc++-v3: all-stagetrain-target-libstdc++-v3
+all-stagetrain: all-stagetrain-target-libstdc++-v3
+TARGET-stagetrain-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stagetrain-target-libstdc++-v3: configure-stagetrain-target-libstdc++-v3
        @[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEtrain_TFLAGS)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -39831,38 +40402,38 @@ all-stagetrain-target-libsanitizer: configure-stagetrain-target-libsanitizer
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGEtrain_TFLAGS)"  \
-               $(TARGET-stagetrain-target-libsanitizer)
+               $(TARGET-stagetrain-target-libstdc++-v3)
 
-maybe-clean-stagetrain-target-libsanitizer: clean-stagetrain-target-libsanitizer
-clean-stagetrain: clean-stagetrain-target-libsanitizer
-clean-stagetrain-target-libsanitizer:
+maybe-clean-stagetrain-target-libstdc++-v3: clean-stagetrain-target-libstdc++-v3
+clean-stagetrain: clean-stagetrain-target-libstdc++-v3
+clean-stagetrain-target-libstdc++-v3:
        @if [ $(current_stage) = stagetrain ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stagetrain-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stagetrain-libstdc++-v3/Makefile ] || exit 0; \
          $(MAKE) stagetrain-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
 
-.PHONY: all-stagefeedback-target-libsanitizer maybe-all-stagefeedback-target-libsanitizer
-.PHONY: clean-stagefeedback-target-libsanitizer maybe-clean-stagefeedback-target-libsanitizer
-maybe-all-stagefeedback-target-libsanitizer:
-maybe-clean-stagefeedback-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stagefeedback-target-libsanitizer: all-stagefeedback-target-libsanitizer
-all-stagefeedback: all-stagefeedback-target-libsanitizer
-TARGET-stagefeedback-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer
+.PHONY: all-stagefeedback-target-libstdc++-v3 maybe-all-stagefeedback-target-libstdc++-v3
+.PHONY: clean-stagefeedback-target-libstdc++-v3 maybe-clean-stagefeedback-target-libstdc++-v3
+maybe-all-stagefeedback-target-libstdc++-v3:
+maybe-clean-stagefeedback-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stagefeedback-target-libstdc++-v3: all-stagefeedback-target-libstdc++-v3
+all-stagefeedback: all-stagefeedback-target-libstdc++-v3
+TARGET-stagefeedback-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -39873,38 +40444,38 @@ all-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitiz
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGEfeedback_TFLAGS)"  \
-               $(TARGET-stagefeedback-target-libsanitizer)
+               $(TARGET-stagefeedback-target-libstdc++-v3)
 
-maybe-clean-stagefeedback-target-libsanitizer: clean-stagefeedback-target-libsanitizer
-clean-stagefeedback: clean-stagefeedback-target-libsanitizer
-clean-stagefeedback-target-libsanitizer:
+maybe-clean-stagefeedback-target-libstdc++-v3: clean-stagefeedback-target-libstdc++-v3
+clean-stagefeedback: clean-stagefeedback-target-libstdc++-v3
+clean-stagefeedback-target-libstdc++-v3:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stagefeedback-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
 
-.PHONY: all-stageautoprofile-target-libsanitizer maybe-all-stageautoprofile-target-libsanitizer
-.PHONY: clean-stageautoprofile-target-libsanitizer maybe-clean-stageautoprofile-target-libsanitizer
-maybe-all-stageautoprofile-target-libsanitizer:
-maybe-clean-stageautoprofile-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stageautoprofile-target-libsanitizer: all-stageautoprofile-target-libsanitizer
-all-stageautoprofile: all-stageautoprofile-target-libsanitizer
-TARGET-stageautoprofile-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stageautoprofile-target-libsanitizer: configure-stageautoprofile-target-libsanitizer
+.PHONY: all-stageautoprofile-target-libstdc++-v3 maybe-all-stageautoprofile-target-libstdc++-v3
+.PHONY: clean-stageautoprofile-target-libstdc++-v3 maybe-clean-stageautoprofile-target-libstdc++-v3
+maybe-all-stageautoprofile-target-libstdc++-v3:
+maybe-clean-stageautoprofile-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stageautoprofile-target-libstdc++-v3: all-stageautoprofile-target-libstdc++-v3
+all-stageautoprofile: all-stageautoprofile-target-libstdc++-v3
+TARGET-stageautoprofile-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stageautoprofile-target-libstdc++-v3: configure-stageautoprofile-target-libstdc++-v3
        @[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -39915,38 +40486,38 @@ all-stageautoprofile-target-libsanitizer: configure-stageautoprofile-target-libs
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-               $(TARGET-stageautoprofile-target-libsanitizer)
+               $(TARGET-stageautoprofile-target-libstdc++-v3)
 
-maybe-clean-stageautoprofile-target-libsanitizer: clean-stageautoprofile-target-libsanitizer
-clean-stageautoprofile: clean-stageautoprofile-target-libsanitizer
-clean-stageautoprofile-target-libsanitizer:
+maybe-clean-stageautoprofile-target-libstdc++-v3: clean-stageautoprofile-target-libstdc++-v3
+clean-stageautoprofile: clean-stageautoprofile-target-libstdc++-v3
+clean-stageautoprofile-target-libstdc++-v3:
        @if [ $(current_stage) = stageautoprofile ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stageautoprofile-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stageautoprofile-libstdc++-v3/Makefile ] || exit 0; \
          $(MAKE) stageautoprofile-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
 
-.PHONY: all-stageautofeedback-target-libsanitizer maybe-all-stageautofeedback-target-libsanitizer
-.PHONY: clean-stageautofeedback-target-libsanitizer maybe-clean-stageautofeedback-target-libsanitizer
-maybe-all-stageautofeedback-target-libsanitizer:
-maybe-clean-stageautofeedback-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stageautofeedback-target-libsanitizer: all-stageautofeedback-target-libsanitizer
-all-stageautofeedback: all-stageautofeedback-target-libsanitizer
-TARGET-stageautofeedback-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stageautofeedback-target-libsanitizer: configure-stageautofeedback-target-libsanitizer
+.PHONY: all-stageautofeedback-target-libstdc++-v3 maybe-all-stageautofeedback-target-libstdc++-v3
+.PHONY: clean-stageautofeedback-target-libstdc++-v3 maybe-clean-stageautofeedback-target-libstdc++-v3
+maybe-all-stageautofeedback-target-libstdc++-v3:
+maybe-clean-stageautofeedback-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stageautofeedback-target-libstdc++-v3: all-stageautofeedback-target-libstdc++-v3
+all-stageautofeedback: all-stageautofeedback-target-libstdc++-v3
+TARGET-stageautofeedback-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stageautofeedback-target-libstdc++-v3: configure-stageautofeedback-target-libstdc++-v3
        @[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -39957,90 +40528,90 @@ all-stageautofeedback-target-libsanitizer: configure-stageautofeedback-target-li
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-               $(TARGET-stageautofeedback-target-libsanitizer)
+               $(TARGET-stageautofeedback-target-libstdc++-v3)
 
-maybe-clean-stageautofeedback-target-libsanitizer: clean-stageautofeedback-target-libsanitizer
-clean-stageautofeedback: clean-stageautofeedback-target-libsanitizer
-clean-stageautofeedback-target-libsanitizer:
+maybe-clean-stageautofeedback-target-libstdc++-v3: clean-stageautofeedback-target-libstdc++-v3
+clean-stageautofeedback: clean-stageautofeedback-target-libstdc++-v3
+clean-stageautofeedback-target-libstdc++-v3:
        @if [ $(current_stage) = stageautofeedback ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stageautofeedback-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stageautofeedback-libstdc++-v3/Makefile ] || exit 0; \
          $(MAKE) stageautofeedback-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
+@endif target-libstdc++-v3-bootstrap
 
 
 
 
 
 
-.PHONY: check-target-libsanitizer maybe-check-target-libsanitizer
-maybe-check-target-libsanitizer:
-@if target-libsanitizer
-maybe-check-target-libsanitizer: check-target-libsanitizer
+.PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
+maybe-check-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
 
-check-target-libsanitizer:
+check-target-libstdc++-v3:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: install-target-libsanitizer maybe-install-target-libsanitizer
-maybe-install-target-libsanitizer:
-@if target-libsanitizer
-maybe-install-target-libsanitizer: install-target-libsanitizer
+.PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
+maybe-install-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
 
-install-target-libsanitizer: installdirs
+install-target-libstdc++-v3: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: install-strip-target-libsanitizer maybe-install-strip-target-libsanitizer
-maybe-install-strip-target-libsanitizer:
-@if target-libsanitizer
-maybe-install-strip-target-libsanitizer: install-strip-target-libsanitizer
+.PHONY: install-strip-target-libstdc++-v3 maybe-install-strip-target-libstdc++-v3
+maybe-install-strip-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-strip-target-libstdc++-v3: install-strip-target-libstdc++-v3
 
-install-strip-target-libsanitizer: installdirs
+install-strip-target-libstdc++-v3: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libsanitizer info-target-libsanitizer
-maybe-info-target-libsanitizer:
-@if target-libsanitizer
-maybe-info-target-libsanitizer: info-target-libsanitizer
+.PHONY: maybe-info-target-libstdc++-v3 info-target-libstdc++-v3
+maybe-info-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
 
-info-target-libsanitizer: \
-    configure-target-libsanitizer 
+info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40048,25 +40619,25 @@ info-target-libsanitizer: \
                   info) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: maybe-dvi-target-libsanitizer dvi-target-libsanitizer
-maybe-dvi-target-libsanitizer:
-@if target-libsanitizer
-maybe-dvi-target-libsanitizer: dvi-target-libsanitizer
+.PHONY: maybe-dvi-target-libstdc++-v3 dvi-target-libstdc++-v3
+maybe-dvi-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
 
-dvi-target-libsanitizer: \
-    configure-target-libsanitizer 
+dvi-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40074,25 +40645,25 @@ dvi-target-libsanitizer: \
                   dvi) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: maybe-pdf-target-libsanitizer pdf-target-libsanitizer
-maybe-pdf-target-libsanitizer:
-@if target-libsanitizer
-maybe-pdf-target-libsanitizer: pdf-target-libsanitizer
+.PHONY: maybe-pdf-target-libstdc++-v3 pdf-target-libstdc++-v3
+maybe-pdf-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-pdf-target-libstdc++-v3: pdf-target-libstdc++-v3
 
-pdf-target-libsanitizer: \
-    configure-target-libsanitizer 
+pdf-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40100,25 +40671,25 @@ pdf-target-libsanitizer: \
                   pdf) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: maybe-html-target-libsanitizer html-target-libsanitizer
-maybe-html-target-libsanitizer:
-@if target-libsanitizer
-maybe-html-target-libsanitizer: html-target-libsanitizer
+.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3
+maybe-html-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
 
-html-target-libsanitizer: \
-    configure-target-libsanitizer 
+html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40126,25 +40697,25 @@ html-target-libsanitizer: \
                   html) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: maybe-TAGS-target-libsanitizer TAGS-target-libsanitizer
-maybe-TAGS-target-libsanitizer:
-@if target-libsanitizer
-maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer
+.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3
+maybe-TAGS-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
 
-TAGS-target-libsanitizer: \
-    configure-target-libsanitizer 
+TAGS-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40152,26 +40723,26 @@ TAGS-target-libsanitizer: \
                   TAGS) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: maybe-install-info-target-libsanitizer install-info-target-libsanitizer
-maybe-install-info-target-libsanitizer:
-@if target-libsanitizer
-maybe-install-info-target-libsanitizer: install-info-target-libsanitizer
+.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3
+maybe-install-info-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
 
-install-info-target-libsanitizer: \
-    configure-target-libsanitizer \
-    info-target-libsanitizer 
+install-info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    info-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40179,26 +40750,26 @@ install-info-target-libsanitizer: \
                   install-info) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: maybe-install-pdf-target-libsanitizer install-pdf-target-libsanitizer
-maybe-install-pdf-target-libsanitizer:
-@if target-libsanitizer
-maybe-install-pdf-target-libsanitizer: install-pdf-target-libsanitizer
+.PHONY: maybe-install-pdf-target-libstdc++-v3 install-pdf-target-libstdc++-v3
+maybe-install-pdf-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-pdf-target-libstdc++-v3: install-pdf-target-libstdc++-v3
 
-install-pdf-target-libsanitizer: \
-    configure-target-libsanitizer \
-    pdf-target-libsanitizer 
+install-pdf-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    pdf-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40206,26 +40777,26 @@ install-pdf-target-libsanitizer: \
                   install-pdf) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: maybe-install-html-target-libsanitizer install-html-target-libsanitizer
-maybe-install-html-target-libsanitizer:
-@if target-libsanitizer
-maybe-install-html-target-libsanitizer: install-html-target-libsanitizer
+.PHONY: maybe-install-html-target-libstdc++-v3 install-html-target-libstdc++-v3
+maybe-install-html-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-html-target-libstdc++-v3: install-html-target-libstdc++-v3
 
-install-html-target-libsanitizer: \
-    configure-target-libsanitizer \
-    html-target-libsanitizer 
+install-html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    html-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40233,25 +40804,25 @@ install-html-target-libsanitizer: \
                   install-html) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: maybe-installcheck-target-libsanitizer installcheck-target-libsanitizer
-maybe-installcheck-target-libsanitizer:
-@if target-libsanitizer
-maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer
+.PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3
+maybe-installcheck-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
 
-installcheck-target-libsanitizer: \
-    configure-target-libsanitizer 
+installcheck-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40259,24 +40830,24 @@ installcheck-target-libsanitizer: \
                   installcheck) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: maybe-mostlyclean-target-libsanitizer mostlyclean-target-libsanitizer
-maybe-mostlyclean-target-libsanitizer:
-@if target-libsanitizer
-maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer
+.PHONY: maybe-mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3
+maybe-mostlyclean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
 
-mostlyclean-target-libsanitizer: 
+mostlyclean-target-libstdc++-v3: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40284,24 +40855,24 @@ mostlyclean-target-libsanitizer:
                   mostlyclean) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: maybe-clean-target-libsanitizer clean-target-libsanitizer
-maybe-clean-target-libsanitizer:
-@if target-libsanitizer
-maybe-clean-target-libsanitizer: clean-target-libsanitizer
+.PHONY: maybe-clean-target-libstdc++-v3 clean-target-libstdc++-v3
+maybe-clean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
 
-clean-target-libsanitizer: 
+clean-target-libstdc++-v3: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40309,24 +40880,24 @@ clean-target-libsanitizer:
                   clean) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: maybe-distclean-target-libsanitizer distclean-target-libsanitizer
-maybe-distclean-target-libsanitizer:
-@if target-libsanitizer
-maybe-distclean-target-libsanitizer: distclean-target-libsanitizer
+.PHONY: maybe-distclean-target-libstdc++-v3 distclean-target-libstdc++-v3
+maybe-distclean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
 
-distclean-target-libsanitizer: 
+distclean-target-libstdc++-v3: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40334,24 +40905,24 @@ distclean-target-libsanitizer:
                   distclean) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
-.PHONY: maybe-maintainer-clean-target-libsanitizer maintainer-clean-target-libsanitizer
-maybe-maintainer-clean-target-libsanitizer:
-@if target-libsanitizer
-maybe-maintainer-clean-target-libsanitizer: maintainer-clean-target-libsanitizer
+.PHONY: maybe-maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3
+maybe-maintainer-clean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
 
-maintainer-clean-target-libsanitizer: 
+maintainer-clean-target-libstdc++-v3: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libsanitizer"; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40359,46 +40930,46 @@ maintainer-clean-target-libsanitizer:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libstdc++-v3
 
 
 
 
 
-.PHONY: configure-target-libmpx maybe-configure-target-libmpx
-maybe-configure-target-libmpx:
+.PHONY: configure-target-libsanitizer maybe-configure-target-libsanitizer
+maybe-configure-target-libsanitizer:
 @if gcc-bootstrap
-configure-target-libmpx: stage_current
+configure-target-libsanitizer: stage_current
 @endif gcc-bootstrap
-@if target-libmpx
-maybe-configure-target-libmpx: configure-target-libmpx
-configure-target-libmpx: 
+@if target-libsanitizer
+maybe-configure-target-libsanitizer: configure-target-libsanitizer
+configure-target-libsanitizer: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libmpx..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libmpx; \
-       cd "$(TARGET_SUBDIR)/libmpx" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libsanitizer; \
+       cd "$(TARGET_SUBDIR)/libsanitizer" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libmpx; \
+       module_srcdir=libsanitizer; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) \
          $$s/$$module_srcdir/configure \
@@ -40406,452 +40977,452 @@ configure-target-libmpx:
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif target-libmpx
+@endif target-libsanitizer
 
 
 
-.PHONY: configure-stage1-target-libmpx maybe-configure-stage1-target-libmpx
-maybe-configure-stage1-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-configure-stage1-target-libmpx: configure-stage1-target-libmpx
-configure-stage1-target-libmpx:
+.PHONY: configure-stage1-target-libsanitizer maybe-configure-stage1-target-libsanitizer
+maybe-configure-stage1-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
+configure-stage1-target-libsanitizer:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       echo "Checking multilib configuration for libmpx..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(TARGET_SUBDIR)/libmpx; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libmpx; \
+       module_srcdir=libsanitizer; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
           \
          $(STAGE1_CONFIGURE_FLAGS)
-@endif target-libmpx-bootstrap
+@endif target-libsanitizer-bootstrap
 
-.PHONY: configure-stage2-target-libmpx maybe-configure-stage2-target-libmpx
-maybe-configure-stage2-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-configure-stage2-target-libmpx: configure-stage2-target-libmpx
-configure-stage2-target-libmpx:
+.PHONY: configure-stage2-target-libsanitizer maybe-configure-stage2-target-libsanitizer
+maybe-configure-stage2-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
+configure-stage2-target-libsanitizer:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       echo "Checking multilib configuration for libmpx..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(TARGET_SUBDIR)/libmpx; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libmpx; \
+       module_srcdir=libsanitizer; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
-@endif target-libmpx-bootstrap
+@endif target-libsanitizer-bootstrap
 
-.PHONY: configure-stage3-target-libmpx maybe-configure-stage3-target-libmpx
-maybe-configure-stage3-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-configure-stage3-target-libmpx: configure-stage3-target-libmpx
-configure-stage3-target-libmpx:
+.PHONY: configure-stage3-target-libsanitizer maybe-configure-stage3-target-libsanitizer
+maybe-configure-stage3-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
+configure-stage3-target-libsanitizer:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       echo "Checking multilib configuration for libmpx..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(TARGET_SUBDIR)/libmpx; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libmpx; \
+       module_srcdir=libsanitizer; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
-@endif target-libmpx-bootstrap
+@endif target-libsanitizer-bootstrap
 
-.PHONY: configure-stage4-target-libmpx maybe-configure-stage4-target-libmpx
-maybe-configure-stage4-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-configure-stage4-target-libmpx: configure-stage4-target-libmpx
-configure-stage4-target-libmpx:
+.PHONY: configure-stage4-target-libsanitizer maybe-configure-stage4-target-libsanitizer
+maybe-configure-stage4-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
+configure-stage4-target-libsanitizer:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       echo "Checking multilib configuration for libmpx..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(TARGET_SUBDIR)/libmpx; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libmpx; \
+       module_srcdir=libsanitizer; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
-@endif target-libmpx-bootstrap
+@endif target-libsanitizer-bootstrap
 
-.PHONY: configure-stageprofile-target-libmpx maybe-configure-stageprofile-target-libmpx
-maybe-configure-stageprofile-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-configure-stageprofile-target-libmpx: configure-stageprofile-target-libmpx
-configure-stageprofile-target-libmpx:
+.PHONY: configure-stageprofile-target-libsanitizer maybe-configure-stageprofile-target-libsanitizer
+maybe-configure-stageprofile-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
+configure-stageprofile-target-libsanitizer:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       echo "Checking multilib configuration for libmpx..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(TARGET_SUBDIR)/libmpx; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libmpx; \
+       module_srcdir=libsanitizer; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
-@endif target-libmpx-bootstrap
+@endif target-libsanitizer-bootstrap
 
-.PHONY: configure-stagetrain-target-libmpx maybe-configure-stagetrain-target-libmpx
-maybe-configure-stagetrain-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-configure-stagetrain-target-libmpx: configure-stagetrain-target-libmpx
-configure-stagetrain-target-libmpx:
+.PHONY: configure-stagetrain-target-libsanitizer maybe-configure-stagetrain-target-libsanitizer
+maybe-configure-stagetrain-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stagetrain-target-libsanitizer: configure-stagetrain-target-libsanitizer
+configure-stagetrain-target-libsanitizer:
        @[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEtrain_TFLAGS)"; \
-       echo "Checking multilib configuration for libmpx..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage train in $(TARGET_SUBDIR)/libmpx; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       echo Configuring stage train in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libmpx; \
+       module_srcdir=libsanitizer; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEtrain_CONFIGURE_FLAGS)
-@endif target-libmpx-bootstrap
+@endif target-libsanitizer-bootstrap
 
-.PHONY: configure-stagefeedback-target-libmpx maybe-configure-stagefeedback-target-libmpx
-maybe-configure-stagefeedback-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-configure-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx
-configure-stagefeedback-target-libmpx:
+.PHONY: configure-stagefeedback-target-libsanitizer maybe-configure-stagefeedback-target-libsanitizer
+maybe-configure-stagefeedback-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer
+configure-stagefeedback-target-libsanitizer:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       echo "Checking multilib configuration for libmpx..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(TARGET_SUBDIR)/libmpx; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libmpx; \
+       module_srcdir=libsanitizer; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif target-libmpx-bootstrap
+@endif target-libsanitizer-bootstrap
 
-.PHONY: configure-stageautoprofile-target-libmpx maybe-configure-stageautoprofile-target-libmpx
-maybe-configure-stageautoprofile-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-configure-stageautoprofile-target-libmpx: configure-stageautoprofile-target-libmpx
-configure-stageautoprofile-target-libmpx:
+.PHONY: configure-stageautoprofile-target-libsanitizer maybe-configure-stageautoprofile-target-libsanitizer
+maybe-configure-stageautoprofile-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stageautoprofile-target-libsanitizer: configure-stageautoprofile-target-libsanitizer
+configure-stageautoprofile-target-libsanitizer:
        @[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-       echo "Checking multilib configuration for libmpx..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libmpx; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libmpx; \
+       module_srcdir=libsanitizer; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif target-libmpx-bootstrap
+@endif target-libsanitizer-bootstrap
 
-.PHONY: configure-stageautofeedback-target-libmpx maybe-configure-stageautofeedback-target-libmpx
-maybe-configure-stageautofeedback-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-configure-stageautofeedback-target-libmpx: configure-stageautofeedback-target-libmpx
-configure-stageautofeedback-target-libmpx:
+.PHONY: configure-stageautofeedback-target-libsanitizer maybe-configure-stageautofeedback-target-libsanitizer
+maybe-configure-stageautofeedback-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stageautofeedback-target-libsanitizer: configure-stageautofeedback-target-libsanitizer
+configure-stageautofeedback-target-libsanitizer:
        @[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-       echo "Checking multilib configuration for libmpx..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libmpx; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libmpx; \
+       module_srcdir=libsanitizer; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif target-libmpx-bootstrap
+@endif target-libsanitizer-bootstrap
 
 
 
 
 
-.PHONY: all-target-libmpx maybe-all-target-libmpx
-maybe-all-target-libmpx:
+.PHONY: all-target-libsanitizer maybe-all-target-libsanitizer
+maybe-all-target-libsanitizer:
 @if gcc-bootstrap
-all-target-libmpx: stage_current
+all-target-libsanitizer: stage_current
 @endif gcc-bootstrap
-@if target-libmpx
-TARGET-target-libmpx=all
-maybe-all-target-libmpx: all-target-libmpx
-all-target-libmpx: configure-target-libmpx
+@if target-libsanitizer
+TARGET-target-libsanitizer=all
+maybe-all-target-libsanitizer: all-target-libsanitizer
+all-target-libsanitizer: configure-target-libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libmpx && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
-               $(TARGET-target-libmpx))
-@endif target-libmpx
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(TARGET-target-libsanitizer))
+@endif target-libsanitizer
 
 
 
-.PHONY: all-stage1-target-libmpx maybe-all-stage1-target-libmpx
-.PHONY: clean-stage1-target-libmpx maybe-clean-stage1-target-libmpx
-maybe-all-stage1-target-libmpx:
-maybe-clean-stage1-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-all-stage1-target-libmpx: all-stage1-target-libmpx
-all-stage1: all-stage1-target-libmpx
-TARGET-stage1-target-libmpx = $(TARGET-target-libmpx)
-all-stage1-target-libmpx: configure-stage1-target-libmpx
+.PHONY: all-stage1-target-libsanitizer maybe-all-stage1-target-libsanitizer
+.PHONY: clean-stage1-target-libsanitizer maybe-clean-stage1-target-libsanitizer
+maybe-all-stage1-target-libsanitizer:
+maybe-clean-stage1-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stage1-target-libsanitizer: all-stage1-target-libsanitizer
+all-stage1: all-stage1-target-libsanitizer
+TARGET-stage1-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       cd $(TARGET_SUBDIR)/libmpx && \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -40860,42 +41431,42 @@ all-stage1-target-libmpx: configure-stage1-target-libmpx
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)  \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
                  \
                TFLAGS="$(STAGE1_TFLAGS)"  \
-               $(TARGET-stage1-target-libmpx)
+               $(TARGET-stage1-target-libsanitizer)
 
-maybe-clean-stage1-target-libmpx: clean-stage1-target-libmpx
-clean-stage1: clean-stage1-target-libmpx
-clean-stage1-target-libmpx:
+maybe-clean-stage1-target-libsanitizer: clean-stage1-target-libsanitizer
+clean-stage1: clean-stage1-target-libsanitizer
+clean-stage1-target-libsanitizer:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage1-libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage1-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libmpx && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
          clean
-@endif target-libmpx-bootstrap
-
-
-.PHONY: all-stage2-target-libmpx maybe-all-stage2-target-libmpx
-.PHONY: clean-stage2-target-libmpx maybe-clean-stage2-target-libmpx
-maybe-all-stage2-target-libmpx:
-maybe-clean-stage2-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-all-stage2-target-libmpx: all-stage2-target-libmpx
-all-stage2: all-stage2-target-libmpx
-TARGET-stage2-target-libmpx = $(TARGET-target-libmpx)
-all-stage2-target-libmpx: configure-stage2-target-libmpx
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stage2-target-libsanitizer maybe-all-stage2-target-libsanitizer
+.PHONY: clean-stage2-target-libsanitizer maybe-clean-stage2-target-libsanitizer
+maybe-all-stage2-target-libsanitizer:
+maybe-clean-stage2-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stage2-target-libsanitizer: all-stage2-target-libsanitizer
+all-stage2: all-stage2-target-libsanitizer
+TARGET-stage2-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libmpx && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -40904,40 +41475,40 @@ all-stage2-target-libmpx: configure-stage2-target-libmpx
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGE2_TFLAGS)"  \
-               $(TARGET-stage2-target-libmpx)
+               $(TARGET-stage2-target-libsanitizer)
 
-maybe-clean-stage2-target-libmpx: clean-stage2-target-libmpx
-clean-stage2: clean-stage2-target-libmpx
-clean-stage2-target-libmpx:
+maybe-clean-stage2-target-libsanitizer: clean-stage2-target-libsanitizer
+clean-stage2: clean-stage2-target-libsanitizer
+clean-stage2-target-libsanitizer:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage2-libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage2-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libmpx && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libmpx-bootstrap
-
-
-.PHONY: all-stage3-target-libmpx maybe-all-stage3-target-libmpx
-.PHONY: clean-stage3-target-libmpx maybe-clean-stage3-target-libmpx
-maybe-all-stage3-target-libmpx:
-maybe-clean-stage3-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-all-stage3-target-libmpx: all-stage3-target-libmpx
-all-stage3: all-stage3-target-libmpx
-TARGET-stage3-target-libmpx = $(TARGET-target-libmpx)
-all-stage3-target-libmpx: configure-stage3-target-libmpx
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stage3-target-libsanitizer maybe-all-stage3-target-libsanitizer
+.PHONY: clean-stage3-target-libsanitizer maybe-clean-stage3-target-libsanitizer
+maybe-all-stage3-target-libsanitizer:
+maybe-clean-stage3-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stage3-target-libsanitizer: all-stage3-target-libsanitizer
+all-stage3: all-stage3-target-libsanitizer
+TARGET-stage3-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libmpx && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -40946,40 +41517,40 @@ all-stage3-target-libmpx: configure-stage3-target-libmpx
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGE3_TFLAGS)"  \
-               $(TARGET-stage3-target-libmpx)
+               $(TARGET-stage3-target-libsanitizer)
 
-maybe-clean-stage3-target-libmpx: clean-stage3-target-libmpx
-clean-stage3: clean-stage3-target-libmpx
-clean-stage3-target-libmpx:
+maybe-clean-stage3-target-libsanitizer: clean-stage3-target-libsanitizer
+clean-stage3: clean-stage3-target-libsanitizer
+clean-stage3-target-libsanitizer:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage3-libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage3-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libmpx && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libmpx-bootstrap
-
-
-.PHONY: all-stage4-target-libmpx maybe-all-stage4-target-libmpx
-.PHONY: clean-stage4-target-libmpx maybe-clean-stage4-target-libmpx
-maybe-all-stage4-target-libmpx:
-maybe-clean-stage4-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-all-stage4-target-libmpx: all-stage4-target-libmpx
-all-stage4: all-stage4-target-libmpx
-TARGET-stage4-target-libmpx = $(TARGET-target-libmpx)
-all-stage4-target-libmpx: configure-stage4-target-libmpx
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stage4-target-libsanitizer maybe-all-stage4-target-libsanitizer
+.PHONY: clean-stage4-target-libsanitizer maybe-clean-stage4-target-libsanitizer
+maybe-all-stage4-target-libsanitizer:
+maybe-clean-stage4-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stage4-target-libsanitizer: all-stage4-target-libsanitizer
+all-stage4: all-stage4-target-libsanitizer
+TARGET-stage4-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libmpx && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -40988,40 +41559,40 @@ all-stage4-target-libmpx: configure-stage4-target-libmpx
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGE4_TFLAGS)"  \
-               $(TARGET-stage4-target-libmpx)
+               $(TARGET-stage4-target-libsanitizer)
 
-maybe-clean-stage4-target-libmpx: clean-stage4-target-libmpx
-clean-stage4: clean-stage4-target-libmpx
-clean-stage4-target-libmpx:
+maybe-clean-stage4-target-libsanitizer: clean-stage4-target-libsanitizer
+clean-stage4: clean-stage4-target-libsanitizer
+clean-stage4-target-libsanitizer:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage4-libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage4-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libmpx && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libmpx-bootstrap
-
-
-.PHONY: all-stageprofile-target-libmpx maybe-all-stageprofile-target-libmpx
-.PHONY: clean-stageprofile-target-libmpx maybe-clean-stageprofile-target-libmpx
-maybe-all-stageprofile-target-libmpx:
-maybe-clean-stageprofile-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-all-stageprofile-target-libmpx: all-stageprofile-target-libmpx
-all-stageprofile: all-stageprofile-target-libmpx
-TARGET-stageprofile-target-libmpx = $(TARGET-target-libmpx)
-all-stageprofile-target-libmpx: configure-stageprofile-target-libmpx
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stageprofile-target-libsanitizer maybe-all-stageprofile-target-libsanitizer
+.PHONY: clean-stageprofile-target-libsanitizer maybe-clean-stageprofile-target-libsanitizer
+maybe-all-stageprofile-target-libsanitizer:
+maybe-clean-stageprofile-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stageprofile-target-libsanitizer: all-stageprofile-target-libsanitizer
+all-stageprofile: all-stageprofile-target-libsanitizer
+TARGET-stageprofile-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libmpx && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -41030,40 +41601,40 @@ all-stageprofile-target-libmpx: configure-stageprofile-target-libmpx
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGEprofile_TFLAGS)"  \
-               $(TARGET-stageprofile-target-libmpx)
+               $(TARGET-stageprofile-target-libsanitizer)
 
-maybe-clean-stageprofile-target-libmpx: clean-stageprofile-target-libmpx
-clean-stageprofile: clean-stageprofile-target-libmpx
-clean-stageprofile-target-libmpx:
+maybe-clean-stageprofile-target-libsanitizer: clean-stageprofile-target-libsanitizer
+clean-stageprofile: clean-stageprofile-target-libsanitizer
+clean-stageprofile-target-libsanitizer:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stageprofile-libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libmpx && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libmpx-bootstrap
-
-
-.PHONY: all-stagetrain-target-libmpx maybe-all-stagetrain-target-libmpx
-.PHONY: clean-stagetrain-target-libmpx maybe-clean-stagetrain-target-libmpx
-maybe-all-stagetrain-target-libmpx:
-maybe-clean-stagetrain-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-all-stagetrain-target-libmpx: all-stagetrain-target-libmpx
-all-stagetrain: all-stagetrain-target-libmpx
-TARGET-stagetrain-target-libmpx = $(TARGET-target-libmpx)
-all-stagetrain-target-libmpx: configure-stagetrain-target-libmpx
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stagetrain-target-libsanitizer maybe-all-stagetrain-target-libsanitizer
+.PHONY: clean-stagetrain-target-libsanitizer maybe-clean-stagetrain-target-libsanitizer
+maybe-all-stagetrain-target-libsanitizer:
+maybe-clean-stagetrain-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stagetrain-target-libsanitizer: all-stagetrain-target-libsanitizer
+all-stagetrain: all-stagetrain-target-libsanitizer
+TARGET-stagetrain-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stagetrain-target-libsanitizer: configure-stagetrain-target-libsanitizer
        @[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEtrain_TFLAGS)"; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libmpx && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -41072,40 +41643,40 @@ all-stagetrain-target-libmpx: configure-stagetrain-target-libmpx
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGEtrain_TFLAGS)"  \
-               $(TARGET-stagetrain-target-libmpx)
+               $(TARGET-stagetrain-target-libsanitizer)
 
-maybe-clean-stagetrain-target-libmpx: clean-stagetrain-target-libmpx
-clean-stagetrain: clean-stagetrain-target-libmpx
-clean-stagetrain-target-libmpx:
+maybe-clean-stagetrain-target-libsanitizer: clean-stagetrain-target-libsanitizer
+clean-stagetrain: clean-stagetrain-target-libsanitizer
+clean-stagetrain-target-libsanitizer:
        @if [ $(current_stage) = stagetrain ]; then \
-         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stagetrain-libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stagetrain-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stagetrain-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libmpx && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libmpx-bootstrap
-
-
-.PHONY: all-stagefeedback-target-libmpx maybe-all-stagefeedback-target-libmpx
-.PHONY: clean-stagefeedback-target-libmpx maybe-clean-stagefeedback-target-libmpx
-maybe-all-stagefeedback-target-libmpx:
-maybe-clean-stagefeedback-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-all-stagefeedback-target-libmpx: all-stagefeedback-target-libmpx
-all-stagefeedback: all-stagefeedback-target-libmpx
-TARGET-stagefeedback-target-libmpx = $(TARGET-target-libmpx)
-all-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libsanitizer maybe-all-stagefeedback-target-libsanitizer
+.PHONY: clean-stagefeedback-target-libsanitizer maybe-clean-stagefeedback-target-libsanitizer
+maybe-all-stagefeedback-target-libsanitizer:
+maybe-clean-stagefeedback-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stagefeedback-target-libsanitizer: all-stagefeedback-target-libsanitizer
+all-stagefeedback: all-stagefeedback-target-libsanitizer
+TARGET-stagefeedback-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libmpx && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -41114,40 +41685,40 @@ all-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGEfeedback_TFLAGS)"  \
-               $(TARGET-stagefeedback-target-libmpx)
+               $(TARGET-stagefeedback-target-libsanitizer)
 
-maybe-clean-stagefeedback-target-libmpx: clean-stagefeedback-target-libmpx
-clean-stagefeedback: clean-stagefeedback-target-libmpx
-clean-stagefeedback-target-libmpx:
+maybe-clean-stagefeedback-target-libsanitizer: clean-stagefeedback-target-libsanitizer
+clean-stagefeedback: clean-stagefeedback-target-libsanitizer
+clean-stagefeedback-target-libsanitizer:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stagefeedback-libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libmpx && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libmpx-bootstrap
-
-
-.PHONY: all-stageautoprofile-target-libmpx maybe-all-stageautoprofile-target-libmpx
-.PHONY: clean-stageautoprofile-target-libmpx maybe-clean-stageautoprofile-target-libmpx
-maybe-all-stageautoprofile-target-libmpx:
-maybe-clean-stageautoprofile-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-all-stageautoprofile-target-libmpx: all-stageautoprofile-target-libmpx
-all-stageautoprofile: all-stageautoprofile-target-libmpx
-TARGET-stageautoprofile-target-libmpx = $(TARGET-target-libmpx)
-all-stageautoprofile-target-libmpx: configure-stageautoprofile-target-libmpx
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stageautoprofile-target-libsanitizer maybe-all-stageautoprofile-target-libsanitizer
+.PHONY: clean-stageautoprofile-target-libsanitizer maybe-clean-stageautoprofile-target-libsanitizer
+maybe-all-stageautoprofile-target-libsanitizer:
+maybe-clean-stageautoprofile-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stageautoprofile-target-libsanitizer: all-stageautoprofile-target-libsanitizer
+all-stageautoprofile: all-stageautoprofile-target-libsanitizer
+TARGET-stageautoprofile-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stageautoprofile-target-libsanitizer: configure-stageautoprofile-target-libsanitizer
        @[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libmpx && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $$s/gcc/config/i386/$(AUTO_PROFILE) \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -41156,40 +41727,40 @@ all-stageautoprofile-target-libmpx: configure-stageautoprofile-target-libmpx
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-               $(TARGET-stageautoprofile-target-libmpx)
+               $(TARGET-stageautoprofile-target-libsanitizer)
 
-maybe-clean-stageautoprofile-target-libmpx: clean-stageautoprofile-target-libmpx
-clean-stageautoprofile: clean-stageautoprofile-target-libmpx
-clean-stageautoprofile-target-libmpx:
+maybe-clean-stageautoprofile-target-libsanitizer: clean-stageautoprofile-target-libsanitizer
+clean-stageautoprofile: clean-stageautoprofile-target-libsanitizer
+clean-stageautoprofile-target-libsanitizer:
        @if [ $(current_stage) = stageautoprofile ]; then \
-         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stageautoprofile-libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stageautoprofile-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stageautoprofile-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libmpx && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libmpx-bootstrap
-
-
-.PHONY: all-stageautofeedback-target-libmpx maybe-all-stageautofeedback-target-libmpx
-.PHONY: clean-stageautofeedback-target-libmpx maybe-clean-stageautofeedback-target-libmpx
-maybe-all-stageautofeedback-target-libmpx:
-maybe-clean-stageautofeedback-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-all-stageautofeedback-target-libmpx: all-stageautofeedback-target-libmpx
-all-stageautofeedback: all-stageautofeedback-target-libmpx
-TARGET-stageautofeedback-target-libmpx = $(TARGET-target-libmpx)
-all-stageautofeedback-target-libmpx: configure-stageautofeedback-target-libmpx
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stageautofeedback-target-libsanitizer maybe-all-stageautofeedback-target-libsanitizer
+.PHONY: clean-stageautofeedback-target-libsanitizer maybe-clean-stageautofeedback-target-libsanitizer
+maybe-all-stageautofeedback-target-libsanitizer:
+maybe-clean-stageautofeedback-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stageautofeedback-target-libsanitizer: all-stageautofeedback-target-libsanitizer
+all-stageautofeedback: all-stageautofeedback-target-libsanitizer
+TARGET-stageautofeedback-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stageautofeedback-target-libsanitizer: configure-stageautofeedback-target-libsanitizer
        @[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libmpx && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
         \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
@@ -41198,92 +41769,92 @@ all-stageautofeedback-target-libmpx: configure-stageautofeedback-target-libmpx
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-               $(TARGET-stageautofeedback-target-libmpx)
+               $(TARGET-stageautofeedback-target-libsanitizer)
 
-maybe-clean-stageautofeedback-target-libmpx: clean-stageautofeedback-target-libmpx
-clean-stageautofeedback: clean-stageautofeedback-target-libmpx
-clean-stageautofeedback-target-libmpx:
+maybe-clean-stageautofeedback-target-libsanitizer: clean-stageautofeedback-target-libsanitizer
+clean-stageautofeedback: clean-stageautofeedback-target-libsanitizer
+clean-stageautofeedback-target-libsanitizer:
        @if [ $(current_stage) = stageautofeedback ]; then \
-         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stageautofeedback-libmpx/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stageautofeedback-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stageautofeedback-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libmpx && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libmpx-bootstrap
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
 
 
 
 
 
 
-.PHONY: check-target-libmpx maybe-check-target-libmpx
-maybe-check-target-libmpx:
-@if target-libmpx
-maybe-check-target-libmpx: check-target-libmpx
+.PHONY: check-target-libsanitizer maybe-check-target-libsanitizer
+maybe-check-target-libsanitizer:
+@if target-libsanitizer
+maybe-check-target-libsanitizer: check-target-libsanitizer
 
-check-target-libmpx:
+check-target-libsanitizer:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libmpx && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: install-target-libmpx maybe-install-target-libmpx
-maybe-install-target-libmpx:
-@if target-libmpx
-maybe-install-target-libmpx: install-target-libmpx
+.PHONY: install-target-libsanitizer maybe-install-target-libsanitizer
+maybe-install-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-target-libsanitizer: install-target-libsanitizer
 
-install-target-libmpx: installdirs
+install-target-libsanitizer: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: install-strip-target-libmpx maybe-install-strip-target-libmpx
-maybe-install-strip-target-libmpx:
-@if target-libmpx
-maybe-install-strip-target-libmpx: install-strip-target-libmpx
+.PHONY: install-strip-target-libsanitizer maybe-install-strip-target-libsanitizer
+maybe-install-strip-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-strip-target-libsanitizer: install-strip-target-libsanitizer
 
-install-strip-target-libmpx: installdirs
+install-strip-target-libsanitizer: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libmpx
+@endif target-libsanitizer
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libmpx info-target-libmpx
-maybe-info-target-libmpx:
-@if target-libmpx
-maybe-info-target-libmpx: info-target-libmpx
+.PHONY: maybe-info-target-libsanitizer info-target-libsanitizer
+maybe-info-target-libsanitizer:
+@if target-libsanitizer
+maybe-info-target-libsanitizer: info-target-libsanitizer
 
-info-target-libmpx: \
-    configure-target-libmpx 
+info-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41291,25 +41862,25 @@ info-target-libmpx: \
                   info) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: maybe-dvi-target-libmpx dvi-target-libmpx
-maybe-dvi-target-libmpx:
-@if target-libmpx
-maybe-dvi-target-libmpx: dvi-target-libmpx
+.PHONY: maybe-dvi-target-libsanitizer dvi-target-libsanitizer
+maybe-dvi-target-libsanitizer:
+@if target-libsanitizer
+maybe-dvi-target-libsanitizer: dvi-target-libsanitizer
 
-dvi-target-libmpx: \
-    configure-target-libmpx 
+dvi-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41317,25 +41888,25 @@ dvi-target-libmpx: \
                   dvi) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: maybe-pdf-target-libmpx pdf-target-libmpx
-maybe-pdf-target-libmpx:
-@if target-libmpx
-maybe-pdf-target-libmpx: pdf-target-libmpx
+.PHONY: maybe-pdf-target-libsanitizer pdf-target-libsanitizer
+maybe-pdf-target-libsanitizer:
+@if target-libsanitizer
+maybe-pdf-target-libsanitizer: pdf-target-libsanitizer
 
-pdf-target-libmpx: \
-    configure-target-libmpx 
+pdf-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41343,25 +41914,25 @@ pdf-target-libmpx: \
                   pdf) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: maybe-html-target-libmpx html-target-libmpx
-maybe-html-target-libmpx:
-@if target-libmpx
-maybe-html-target-libmpx: html-target-libmpx
+.PHONY: maybe-html-target-libsanitizer html-target-libsanitizer
+maybe-html-target-libsanitizer:
+@if target-libsanitizer
+maybe-html-target-libsanitizer: html-target-libsanitizer
 
-html-target-libmpx: \
-    configure-target-libmpx 
+html-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41369,25 +41940,25 @@ html-target-libmpx: \
                   html) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: maybe-TAGS-target-libmpx TAGS-target-libmpx
-maybe-TAGS-target-libmpx:
-@if target-libmpx
-maybe-TAGS-target-libmpx: TAGS-target-libmpx
+.PHONY: maybe-TAGS-target-libsanitizer TAGS-target-libsanitizer
+maybe-TAGS-target-libsanitizer:
+@if target-libsanitizer
+maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer
 
-TAGS-target-libmpx: \
-    configure-target-libmpx 
+TAGS-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41395,26 +41966,26 @@ TAGS-target-libmpx: \
                   TAGS) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: maybe-install-info-target-libmpx install-info-target-libmpx
-maybe-install-info-target-libmpx:
-@if target-libmpx
-maybe-install-info-target-libmpx: install-info-target-libmpx
+.PHONY: maybe-install-info-target-libsanitizer install-info-target-libsanitizer
+maybe-install-info-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-info-target-libsanitizer: install-info-target-libsanitizer
 
-install-info-target-libmpx: \
-    configure-target-libmpx \
-    info-target-libmpx 
+install-info-target-libsanitizer: \
+    configure-target-libsanitizer \
+    info-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41422,26 +41993,26 @@ install-info-target-libmpx: \
                   install-info) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: maybe-install-pdf-target-libmpx install-pdf-target-libmpx
-maybe-install-pdf-target-libmpx:
-@if target-libmpx
-maybe-install-pdf-target-libmpx: install-pdf-target-libmpx
+.PHONY: maybe-install-pdf-target-libsanitizer install-pdf-target-libsanitizer
+maybe-install-pdf-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-pdf-target-libsanitizer: install-pdf-target-libsanitizer
 
-install-pdf-target-libmpx: \
-    configure-target-libmpx \
-    pdf-target-libmpx 
+install-pdf-target-libsanitizer: \
+    configure-target-libsanitizer \
+    pdf-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41449,26 +42020,26 @@ install-pdf-target-libmpx: \
                   install-pdf) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: maybe-install-html-target-libmpx install-html-target-libmpx
-maybe-install-html-target-libmpx:
-@if target-libmpx
-maybe-install-html-target-libmpx: install-html-target-libmpx
+.PHONY: maybe-install-html-target-libsanitizer install-html-target-libsanitizer
+maybe-install-html-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-html-target-libsanitizer: install-html-target-libsanitizer
 
-install-html-target-libmpx: \
-    configure-target-libmpx \
-    html-target-libmpx 
+install-html-target-libsanitizer: \
+    configure-target-libsanitizer \
+    html-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41476,25 +42047,25 @@ install-html-target-libmpx: \
                   install-html) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: maybe-installcheck-target-libmpx installcheck-target-libmpx
-maybe-installcheck-target-libmpx:
-@if target-libmpx
-maybe-installcheck-target-libmpx: installcheck-target-libmpx
+.PHONY: maybe-installcheck-target-libsanitizer installcheck-target-libsanitizer
+maybe-installcheck-target-libsanitizer:
+@if target-libsanitizer
+maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer
 
-installcheck-target-libmpx: \
-    configure-target-libmpx 
+installcheck-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41502,24 +42073,24 @@ installcheck-target-libmpx: \
                   installcheck) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: maybe-mostlyclean-target-libmpx mostlyclean-target-libmpx
-maybe-mostlyclean-target-libmpx:
-@if target-libmpx
-maybe-mostlyclean-target-libmpx: mostlyclean-target-libmpx
+.PHONY: maybe-mostlyclean-target-libsanitizer mostlyclean-target-libsanitizer
+maybe-mostlyclean-target-libsanitizer:
+@if target-libsanitizer
+maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer
 
-mostlyclean-target-libmpx: 
+mostlyclean-target-libsanitizer: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41527,24 +42098,24 @@ mostlyclean-target-libmpx:
                   mostlyclean) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: maybe-clean-target-libmpx clean-target-libmpx
-maybe-clean-target-libmpx:
-@if target-libmpx
-maybe-clean-target-libmpx: clean-target-libmpx
+.PHONY: maybe-clean-target-libsanitizer clean-target-libsanitizer
+maybe-clean-target-libsanitizer:
+@if target-libsanitizer
+maybe-clean-target-libsanitizer: clean-target-libsanitizer
 
-clean-target-libmpx: 
+clean-target-libsanitizer: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41552,24 +42123,24 @@ clean-target-libmpx:
                   clean) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: maybe-distclean-target-libmpx distclean-target-libmpx
-maybe-distclean-target-libmpx:
-@if target-libmpx
-maybe-distclean-target-libmpx: distclean-target-libmpx
+.PHONY: maybe-distclean-target-libsanitizer distclean-target-libsanitizer
+maybe-distclean-target-libsanitizer:
+@if target-libsanitizer
+maybe-distclean-target-libsanitizer: distclean-target-libsanitizer
 
-distclean-target-libmpx: 
+distclean-target-libsanitizer: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41577,24 +42148,24 @@ distclean-target-libmpx:
                   distclean) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
-.PHONY: maybe-maintainer-clean-target-libmpx maintainer-clean-target-libmpx
-maybe-maintainer-clean-target-libmpx:
-@if target-libmpx
-maybe-maintainer-clean-target-libmpx: maintainer-clean-target-libmpx
+.PHONY: maybe-maintainer-clean-target-libsanitizer maintainer-clean-target-libsanitizer
+maybe-maintainer-clean-target-libsanitizer:
+@if target-libsanitizer
+maybe-maintainer-clean-target-libsanitizer: maintainer-clean-target-libsanitizer
 
-maintainer-clean-target-libmpx: 
+maintainer-clean-target-libsanitizer: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmpx"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libsanitizer"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmpx && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41602,7 +42173,7 @@ maintainer-clean-target-libmpx:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
 
 
@@ -48211,6 +48782,464 @@ maintainer-clean-target-libhsail-rt:
 
 
 
+.PHONY: configure-target-libphobos maybe-configure-target-libphobos
+maybe-configure-target-libphobos:
+@if gcc-bootstrap
+configure-target-libphobos: stage_current
+@endif gcc-bootstrap
+@if target-libphobos
+maybe-configure-target-libphobos: configure-target-libphobos
+configure-target-libphobos: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libphobos..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libphobos; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libphobos/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libphobos/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libphobos/multilib.tmp $(TARGET_SUBDIR)/libphobos/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libphobos/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libphobos/Makefile; \
+           mv $(TARGET_SUBDIR)/libphobos/multilib.tmp $(TARGET_SUBDIR)/libphobos/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libphobos/multilib.tmp $(TARGET_SUBDIR)/libphobos/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libphobos/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libphobos; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libphobos; \
+       cd "$(TARGET_SUBDIR)/libphobos" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libphobos/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libphobos; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias}  \
+         || exit 1
+@endif target-libphobos
+
+
+
+
+
+.PHONY: all-target-libphobos maybe-all-target-libphobos
+maybe-all-target-libphobos:
+@if gcc-bootstrap
+all-target-libphobos: stage_current
+@endif gcc-bootstrap
+@if target-libphobos
+TARGET-target-libphobos=all
+maybe-all-target-libphobos: all-target-libphobos
+all-target-libphobos: configure-target-libphobos
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libphobos))
+@endif target-libphobos
+
+
+
+
+
+.PHONY: check-target-libphobos maybe-check-target-libphobos
+maybe-check-target-libphobos:
+@if target-libphobos
+maybe-check-target-libphobos: check-target-libphobos
+
+check-target-libphobos:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libphobos
+
+.PHONY: install-target-libphobos maybe-install-target-libphobos
+maybe-install-target-libphobos:
+@if target-libphobos
+maybe-install-target-libphobos: install-target-libphobos
+
+install-target-libphobos: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libphobos
+
+.PHONY: install-strip-target-libphobos maybe-install-strip-target-libphobos
+maybe-install-strip-target-libphobos:
+@if target-libphobos
+maybe-install-strip-target-libphobos: install-strip-target-libphobos
+
+install-strip-target-libphobos: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libphobos
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libphobos info-target-libphobos
+maybe-info-target-libphobos:
+@if target-libphobos
+maybe-info-target-libphobos: info-target-libphobos
+
+info-target-libphobos: \
+    configure-target-libphobos 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  info) \
+         || exit 1
+
+@endif target-libphobos
+
+.PHONY: maybe-dvi-target-libphobos dvi-target-libphobos
+maybe-dvi-target-libphobos:
+@if target-libphobos
+maybe-dvi-target-libphobos: dvi-target-libphobos
+
+dvi-target-libphobos: \
+    configure-target-libphobos 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  dvi) \
+         || exit 1
+
+@endif target-libphobos
+
+.PHONY: maybe-pdf-target-libphobos pdf-target-libphobos
+maybe-pdf-target-libphobos:
+@if target-libphobos
+maybe-pdf-target-libphobos: pdf-target-libphobos
+
+pdf-target-libphobos: \
+    configure-target-libphobos 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  pdf) \
+         || exit 1
+
+@endif target-libphobos
+
+.PHONY: maybe-html-target-libphobos html-target-libphobos
+maybe-html-target-libphobos:
+@if target-libphobos
+maybe-html-target-libphobos: html-target-libphobos
+
+html-target-libphobos: \
+    configure-target-libphobos 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  html) \
+         || exit 1
+
+@endif target-libphobos
+
+.PHONY: maybe-TAGS-target-libphobos TAGS-target-libphobos
+maybe-TAGS-target-libphobos:
+@if target-libphobos
+maybe-TAGS-target-libphobos: TAGS-target-libphobos
+
+TAGS-target-libphobos: \
+    configure-target-libphobos 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  TAGS) \
+         || exit 1
+
+@endif target-libphobos
+
+.PHONY: maybe-install-info-target-libphobos install-info-target-libphobos
+maybe-install-info-target-libphobos:
+@if target-libphobos
+maybe-install-info-target-libphobos: install-info-target-libphobos
+
+install-info-target-libphobos: \
+    configure-target-libphobos \
+    info-target-libphobos 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  install-info) \
+         || exit 1
+
+@endif target-libphobos
+
+.PHONY: maybe-install-pdf-target-libphobos install-pdf-target-libphobos
+maybe-install-pdf-target-libphobos:
+@if target-libphobos
+maybe-install-pdf-target-libphobos: install-pdf-target-libphobos
+
+install-pdf-target-libphobos: \
+    configure-target-libphobos \
+    pdf-target-libphobos 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  install-pdf) \
+         || exit 1
+
+@endif target-libphobos
+
+.PHONY: maybe-install-html-target-libphobos install-html-target-libphobos
+maybe-install-html-target-libphobos:
+@if target-libphobos
+maybe-install-html-target-libphobos: install-html-target-libphobos
+
+install-html-target-libphobos: \
+    configure-target-libphobos \
+    html-target-libphobos 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  install-html) \
+         || exit 1
+
+@endif target-libphobos
+
+.PHONY: maybe-installcheck-target-libphobos installcheck-target-libphobos
+maybe-installcheck-target-libphobos:
+@if target-libphobos
+maybe-installcheck-target-libphobos: installcheck-target-libphobos
+
+installcheck-target-libphobos: \
+    configure-target-libphobos 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  installcheck) \
+         || exit 1
+
+@endif target-libphobos
+
+.PHONY: maybe-mostlyclean-target-libphobos mostlyclean-target-libphobos
+maybe-mostlyclean-target-libphobos:
+@if target-libphobos
+maybe-mostlyclean-target-libphobos: mostlyclean-target-libphobos
+
+mostlyclean-target-libphobos: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  mostlyclean) \
+         || exit 1
+
+@endif target-libphobos
+
+.PHONY: maybe-clean-target-libphobos clean-target-libphobos
+maybe-clean-target-libphobos:
+@if target-libphobos
+maybe-clean-target-libphobos: clean-target-libphobos
+
+clean-target-libphobos: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  clean) \
+         || exit 1
+
+@endif target-libphobos
+
+.PHONY: maybe-distclean-target-libphobos distclean-target-libphobos
+maybe-distclean-target-libphobos:
+@if target-libphobos
+maybe-distclean-target-libphobos: distclean-target-libphobos
+
+distclean-target-libphobos: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  distclean) \
+         || exit 1
+
+@endif target-libphobos
+
+.PHONY: maybe-maintainer-clean-target-libphobos maintainer-clean-target-libphobos
+maybe-maintainer-clean-target-libphobos:
+@if target-libphobos
+maybe-maintainer-clean-target-libphobos: maintainer-clean-target-libphobos
+
+maintainer-clean-target-libphobos: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libphobos"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libphobos && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  maintainer-clean) \
+         || exit 1
+
+@endif target-libphobos
+
+
+
+
+
 .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
 maybe-configure-target-libtermcap:
 @if gcc-bootstrap
@@ -53499,6 +54528,10 @@ maintainer-clean-target-libatomic:
 check-target-libgomp-c++:
        $(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++.exp" check-target-libgomp
 
+.PHONY: check-target-libgomp-fortran
+check-target-libgomp-fortran:
+       $(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) fortran.exp" check-target-libgomp
+
 @endif target-libgomp
 
 @if target-libitm
@@ -53550,7 +54583,7 @@ check-gcc-fortran:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-fortran);
-check-fortran: check-gcc-fortran check-target-libquadmath check-target-libgfortran
+check-fortran: check-gcc-fortran check-target-libquadmath check-target-libgfortran check-target-libgomp-fortran
 
 .PHONY: check-gcc-ada check-ada
 check-gcc-ada:
@@ -53592,6 +54625,14 @@ check-gcc-brig:
        (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-brig);
 check-brig: check-gcc-brig check-target-libhsail-rt
 
+.PHONY: check-gcc-d check-d
+check-gcc-d:
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-d);
+check-d: check-gcc-d check-target-libphobos
+
 
 # The gcc part of install-no-fixedincludes, which relies on an intimate
 # knowledge of how a number of gcc internal targets (inter)operate.  Delegate.
@@ -53774,6 +54815,11 @@ stage1-start::
          mkdir stage1-lto-plugin; \
        mv stage1-lto-plugin lto-plugin
 @endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stage1-libctf ] || \
+         mkdir stage1-libctf; \
+       mv stage1-libctf libctf
+@endif libctf
        @[ -d stage1-$(TARGET_SUBDIR) ] || \
          mkdir stage1-$(TARGET_SUBDIR); \
        mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR)
@@ -53889,6 +54935,11 @@ stage1-end::
          cd $(HOST_SUBDIR); mv lto-plugin stage1-lto-plugin; \
        fi
 @endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stage1-libctf; \
+       fi
+@endif libctf
        @if test -d $(TARGET_SUBDIR); then \
          mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); \
        fi
@@ -54069,6 +55120,12 @@ stage2-start::
        mv stage2-lto-plugin lto-plugin; \
        mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
 @endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stage2-libctf ] || \
+         mkdir stage2-libctf; \
+       mv stage2-libctf libctf; \
+       mv stage1-libctf prev-libctf || test -f stage1-lean 
+@endif libctf
        @[ -d stage2-$(TARGET_SUBDIR) ] || \
          mkdir stage2-$(TARGET_SUBDIR); \
        mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
@@ -54207,6 +55264,12 @@ stage2-end::
          mv prev-lto-plugin stage1-lto-plugin; : ; \
        fi
 @endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stage2-libctf; \
+         mv prev-libctf stage1-libctf; : ; \
+       fi
+@endif libctf
        @if test -d $(TARGET_SUBDIR); then \
          mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR); \
          mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \
@@ -54411,6 +55474,12 @@ stage3-start::
        mv stage3-lto-plugin lto-plugin; \
        mv stage2-lto-plugin prev-lto-plugin || test -f stage2-lean 
 @endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stage3-libctf ] || \
+         mkdir stage3-libctf; \
+       mv stage3-libctf libctf; \
+       mv stage2-libctf prev-libctf || test -f stage2-lean 
+@endif libctf
        @[ -d stage3-$(TARGET_SUBDIR) ] || \
          mkdir stage3-$(TARGET_SUBDIR); \
        mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
@@ -54549,6 +55618,12 @@ stage3-end::
          mv prev-lto-plugin stage2-lto-plugin; : ; \
        fi
 @endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stage3-libctf; \
+         mv prev-libctf stage2-libctf; : ; \
+       fi
+@endif libctf
        @if test -d $(TARGET_SUBDIR); then \
          mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR); \
          mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR); : ; \
@@ -54594,7 +55669,7 @@ compare:
         sed=`echo stage3 | sed 's,^stage,,;s,.,.,g'`; \
        files=`find stage3-* -name "*$(objext)" -print | \
                 sed -n s,^stage$$sed-,,p`; \
-       for file in $${files}; do \
+       for file in $${files} ${extra-compare}; do \
          f1=$$r/stage2-$$file; f2=$$r/stage3-$$file; \
          if test ! -f $$f1; then continue; fi; \
          $(do-compare) > /dev/null 2>&1; \
@@ -54809,6 +55884,12 @@ stage4-start::
        mv stage4-lto-plugin lto-plugin; \
        mv stage3-lto-plugin prev-lto-plugin || test -f stage3-lean 
 @endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stage4-libctf ] || \
+         mkdir stage4-libctf; \
+       mv stage4-libctf libctf; \
+       mv stage3-libctf prev-libctf || test -f stage3-lean 
+@endif libctf
        @[ -d stage4-$(TARGET_SUBDIR) ] || \
          mkdir stage4-$(TARGET_SUBDIR); \
        mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
@@ -54947,6 +56028,12 @@ stage4-end::
          mv prev-lto-plugin stage3-lto-plugin; : ; \
        fi
 @endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stage4-libctf; \
+         mv prev-libctf stage3-libctf; : ; \
+       fi
+@endif libctf
        @if test -d $(TARGET_SUBDIR); then \
          mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR); \
          mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR); : ; \
@@ -54992,7 +56079,7 @@ compare3:
         sed=`echo stage4 | sed 's,^stage,,;s,.,.,g'`; \
        files=`find stage4-* -name "*$(objext)" -print | \
                 sed -n s,^stage$$sed-,,p`; \
-       for file in $${files}; do \
+       for file in $${files} ${extra-compare}; do \
          f1=$$r/stage3-$$file; f2=$$r/stage4-$$file; \
          if test ! -f $$f1; then continue; fi; \
          $(do-compare3) > /dev/null 2>&1; \
@@ -55195,6 +56282,12 @@ stageprofile-start::
        mv stageprofile-lto-plugin lto-plugin; \
        mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
 @endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libctf ] || \
+         mkdir stageprofile-libctf; \
+       mv stageprofile-libctf libctf; \
+       mv stage1-libctf prev-libctf || test -f stage1-lean 
+@endif libctf
        @[ -d stageprofile-$(TARGET_SUBDIR) ] || \
          mkdir stageprofile-$(TARGET_SUBDIR); \
        mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
@@ -55333,6 +56426,12 @@ stageprofile-end::
          mv prev-lto-plugin stage1-lto-plugin; : ; \
        fi
 @endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stageprofile-libctf; \
+         mv prev-libctf stage1-libctf; : ; \
+       fi
+@endif libctf
        @if test -d $(TARGET_SUBDIR); then \
          mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR); \
          mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \
@@ -55514,6 +56613,12 @@ stagetrain-start::
        mv stagetrain-lto-plugin lto-plugin; \
        mv stageprofile-lto-plugin prev-lto-plugin || test -f stageprofile-lean 
 @endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stagetrain-libctf ] || \
+         mkdir stagetrain-libctf; \
+       mv stagetrain-libctf libctf; \
+       mv stageprofile-libctf prev-libctf || test -f stageprofile-lean 
+@endif libctf
        @[ -d stagetrain-$(TARGET_SUBDIR) ] || \
          mkdir stagetrain-$(TARGET_SUBDIR); \
        mv stagetrain-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
@@ -55652,6 +56757,12 @@ stagetrain-end::
          mv prev-lto-plugin stageprofile-lto-plugin; : ; \
        fi
 @endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stagetrain-libctf; \
+         mv prev-libctf stageprofile-libctf; : ; \
+       fi
+@endif libctf
        @if test -d $(TARGET_SUBDIR); then \
          mv $(TARGET_SUBDIR) stagetrain-$(TARGET_SUBDIR); \
          mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR); : ; \
@@ -55833,6 +56944,12 @@ stagefeedback-start::
        mv stagefeedback-lto-plugin lto-plugin; \
        mv stagetrain-lto-plugin prev-lto-plugin || test -f stagetrain-lean 
 @endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-libctf ] || \
+         mkdir stagefeedback-libctf; \
+       mv stagefeedback-libctf libctf; \
+       mv stagetrain-libctf prev-libctf || test -f stagetrain-lean 
+@endif libctf
        @[ -d stagefeedback-$(TARGET_SUBDIR) ] || \
          mkdir stagefeedback-$(TARGET_SUBDIR); \
        mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
@@ -55971,6 +57088,12 @@ stagefeedback-end::
          mv prev-lto-plugin stagetrain-lto-plugin; : ; \
        fi
 @endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stagefeedback-libctf; \
+         mv prev-libctf stagetrain-libctf; : ; \
+       fi
+@endif libctf
        @if test -d $(TARGET_SUBDIR); then \
          mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR); \
          mv prev-$(TARGET_SUBDIR) stagetrain-$(TARGET_SUBDIR); : ; \
@@ -56175,6 +57298,12 @@ stageautoprofile-start::
        mv stageautoprofile-lto-plugin lto-plugin; \
        mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
 @endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stageautoprofile-libctf ] || \
+         mkdir stageautoprofile-libctf; \
+       mv stageautoprofile-libctf libctf; \
+       mv stage1-libctf prev-libctf || test -f stage1-lean 
+@endif libctf
        @[ -d stageautoprofile-$(TARGET_SUBDIR) ] || \
          mkdir stageautoprofile-$(TARGET_SUBDIR); \
        mv stageautoprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
@@ -56313,6 +57442,12 @@ stageautoprofile-end::
          mv prev-lto-plugin stage1-lto-plugin; : ; \
        fi
 @endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stageautoprofile-libctf; \
+         mv prev-libctf stage1-libctf; : ; \
+       fi
+@endif libctf
        @if test -d $(TARGET_SUBDIR); then \
          mv $(TARGET_SUBDIR) stageautoprofile-$(TARGET_SUBDIR); \
          mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \
@@ -56494,6 +57629,12 @@ stageautofeedback-start::
        mv stageautofeedback-lto-plugin lto-plugin; \
        mv stageautoprofile-lto-plugin prev-lto-plugin || test -f stageautoprofile-lean 
 @endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stageautofeedback-libctf ] || \
+         mkdir stageautofeedback-libctf; \
+       mv stageautofeedback-libctf libctf; \
+       mv stageautoprofile-libctf prev-libctf || test -f stageautoprofile-lean 
+@endif libctf
        @[ -d stageautofeedback-$(TARGET_SUBDIR) ] || \
          mkdir stageautofeedback-$(TARGET_SUBDIR); \
        mv stageautofeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
@@ -56632,6 +57773,12 @@ stageautofeedback-end::
          mv prev-lto-plugin stageautoprofile-lto-plugin; : ; \
        fi
 @endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stageautofeedback-libctf; \
+         mv prev-libctf stageautoprofile-libctf; : ; \
+       fi
+@endif libctf
        @if test -d $(TARGET_SUBDIR); then \
          mv $(TARGET_SUBDIR) stageautofeedback-$(TARGET_SUBDIR); \
          mv prev-$(TARGET_SUBDIR) stageautoprofile-$(TARGET_SUBDIR); : ; \
@@ -56704,8 +57851,8 @@ stageprofile-end::
 stagefeedback-start::
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       for i in stageprofile-*; do \
-         j=`echo $$i | sed s/^stageprofile-//`; \
+       for i in prev-*; do \
+         j=`echo $$i | sed s/^prev-//`; \
          cd $$r/$$i && \
          { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL); } && \
          { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL); }; \
@@ -56757,15 +57904,6 @@ configure-stagetrain-target-libsanitizer: maybe-all-stagetrain-gcc
 configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-gcc
 configure-stageautoprofile-target-libsanitizer: maybe-all-stageautoprofile-gcc
 configure-stageautofeedback-target-libsanitizer: maybe-all-stageautofeedback-gcc
-configure-stage1-target-libmpx: maybe-all-stage1-gcc
-configure-stage2-target-libmpx: maybe-all-stage2-gcc
-configure-stage3-target-libmpx: maybe-all-stage3-gcc
-configure-stage4-target-libmpx: maybe-all-stage4-gcc
-configure-stageprofile-target-libmpx: maybe-all-stageprofile-gcc
-configure-stagetrain-target-libmpx: maybe-all-stagetrain-gcc
-configure-stagefeedback-target-libmpx: maybe-all-stagefeedback-gcc
-configure-stageautoprofile-target-libmpx: maybe-all-stageautoprofile-gcc
-configure-stageautofeedback-target-libmpx: maybe-all-stageautofeedback-gcc
 configure-stage1-target-libvtv: maybe-all-stage1-gcc
 configure-stage2-target-libvtv: maybe-all-stage2-gcc
 configure-stage3-target-libvtv: maybe-all-stage3-gcc
@@ -56793,6 +57931,7 @@ configure-target-libgfortran: stage_last
 configure-target-libobjc: stage_last
 configure-target-libgo: stage_last
 configure-target-libhsail-rt: stage_last
+configure-target-libphobos: stage_last
 configure-target-libtermcap: stage_last
 configure-target-winsup: stage_last
 configure-target-libgloss: stage_last
@@ -56816,7 +57955,6 @@ configure-target-libatomic: stage_last
 @if gcc-no-bootstrap
 configure-target-libstdc++-v3: maybe-all-gcc
 configure-target-libsanitizer: maybe-all-gcc
-configure-target-libmpx: maybe-all-gcc
 configure-target-libvtv: maybe-all-gcc
 configure-target-liboffloadmic: maybe-all-gcc
 configure-target-libssp: maybe-all-gcc
@@ -56828,6 +57966,7 @@ configure-target-libgfortran: maybe-all-gcc
 configure-target-libobjc: maybe-all-gcc
 configure-target-libgo: maybe-all-gcc
 configure-target-libhsail-rt: maybe-all-gcc
+configure-target-libphobos: maybe-all-gcc
 configure-target-libtermcap: maybe-all-gcc
 configure-target-winsup: maybe-all-gcc
 configure-target-libgloss: maybe-all-gcc
@@ -56867,7 +58006,6 @@ all-build-m4: maybe-all-build-texinfo
 all-build-fixincludes: maybe-all-build-libiberty
 all-build-libcpp: maybe-all-build-libiberty
 configure-gcc: maybe-configure-intl
-
 configure-stage1-gcc: maybe-configure-stage1-intl
 configure-stage2-gcc: maybe-configure-stage2-intl
 configure-stage3-gcc: maybe-configure-stage3-intl
@@ -56878,7 +58016,6 @@ configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
 configure-stageautoprofile-gcc: maybe-configure-stageautoprofile-intl
 configure-stageautofeedback-gcc: maybe-configure-stageautofeedback-intl
 configure-gcc: maybe-all-gmp
-
 configure-stage1-gcc: maybe-all-stage1-gmp
 configure-stage2-gcc: maybe-all-stage2-gmp
 configure-stage3-gcc: maybe-all-stage3-gmp
@@ -56889,7 +58026,6 @@ configure-stagefeedback-gcc: maybe-all-stagefeedback-gmp
 configure-stageautoprofile-gcc: maybe-all-stageautoprofile-gmp
 configure-stageautofeedback-gcc: maybe-all-stageautofeedback-gmp
 configure-gcc: maybe-all-mpfr
-
 configure-stage1-gcc: maybe-all-stage1-mpfr
 configure-stage2-gcc: maybe-all-stage2-mpfr
 configure-stage3-gcc: maybe-all-stage3-mpfr
@@ -56900,7 +58036,6 @@ configure-stagefeedback-gcc: maybe-all-stagefeedback-mpfr
 configure-stageautoprofile-gcc: maybe-all-stageautoprofile-mpfr
 configure-stageautofeedback-gcc: maybe-all-stageautofeedback-mpfr
 configure-gcc: maybe-all-mpc
-
 configure-stage1-gcc: maybe-all-stage1-mpc
 configure-stage2-gcc: maybe-all-stage2-mpc
 configure-stage3-gcc: maybe-all-stage3-mpc
@@ -56911,7 +58046,6 @@ configure-stagefeedback-gcc: maybe-all-stagefeedback-mpc
 configure-stageautoprofile-gcc: maybe-all-stageautoprofile-mpc
 configure-stageautofeedback-gcc: maybe-all-stageautofeedback-mpc
 configure-gcc: maybe-all-isl
-
 configure-stage1-gcc: maybe-all-stage1-isl
 configure-stage2-gcc: maybe-all-stage2-isl
 configure-stage3-gcc: maybe-all-stage3-isl
@@ -56922,7 +58056,6 @@ configure-stagefeedback-gcc: maybe-all-stagefeedback-isl
 configure-stageautoprofile-gcc: maybe-all-stageautoprofile-isl
 configure-stageautofeedback-gcc: maybe-all-stageautofeedback-isl
 configure-gcc: maybe-all-lto-plugin
-
 configure-stage1-gcc: maybe-all-stage1-lto-plugin
 configure-stage2-gcc: maybe-all-stage2-lto-plugin
 configure-stage3-gcc: maybe-all-stage3-lto-plugin
@@ -56933,7 +58066,6 @@ configure-stagefeedback-gcc: maybe-all-stagefeedback-lto-plugin
 configure-stageautoprofile-gcc: maybe-all-stageautoprofile-lto-plugin
 configure-stageautofeedback-gcc: maybe-all-stageautofeedback-lto-plugin
 configure-gcc: maybe-all-binutils
-
 configure-stage1-gcc: maybe-all-stage1-binutils
 configure-stage2-gcc: maybe-all-stage2-binutils
 configure-stage3-gcc: maybe-all-stage3-binutils
@@ -56944,7 +58076,6 @@ configure-stagefeedback-gcc: maybe-all-stagefeedback-binutils
 configure-stageautoprofile-gcc: maybe-all-stageautoprofile-binutils
 configure-stageautofeedback-gcc: maybe-all-stageautofeedback-binutils
 configure-gcc: maybe-all-gas
-
 configure-stage1-gcc: maybe-all-stage1-gas
 configure-stage2-gcc: maybe-all-stage2-gas
 configure-stage3-gcc: maybe-all-stage3-gas
@@ -56955,7 +58086,6 @@ configure-stagefeedback-gcc: maybe-all-stagefeedback-gas
 configure-stageautoprofile-gcc: maybe-all-stageautoprofile-gas
 configure-stageautofeedback-gcc: maybe-all-stageautofeedback-gas
 configure-gcc: maybe-all-ld
-
 configure-stage1-gcc: maybe-all-stage1-ld
 configure-stage2-gcc: maybe-all-stage2-ld
 configure-stage3-gcc: maybe-all-stage3-ld
@@ -56966,7 +58096,6 @@ configure-stagefeedback-gcc: maybe-all-stagefeedback-ld
 configure-stageautoprofile-gcc: maybe-all-stageautoprofile-ld
 configure-stageautofeedback-gcc: maybe-all-stageautofeedback-ld
 configure-gcc: maybe-all-gold
-
 configure-stage1-gcc: maybe-all-stage1-gold
 configure-stage2-gcc: maybe-all-stage2-gold
 configure-stage3-gcc: maybe-all-stage3-gold
@@ -56977,7 +58106,6 @@ configure-stagefeedback-gcc: maybe-all-stagefeedback-gold
 configure-stageautoprofile-gcc: maybe-all-stageautoprofile-gold
 configure-stageautofeedback-gcc: maybe-all-stageautofeedback-gold
 configure-gcc: maybe-all-libelf
-
 configure-stage1-gcc: maybe-all-stage1-libelf
 configure-stage2-gcc: maybe-all-stage2-libelf
 configure-stage3-gcc: maybe-all-stage3-libelf
@@ -56988,7 +58116,6 @@ configure-stagefeedback-gcc: maybe-all-stagefeedback-libelf
 configure-stageautoprofile-gcc: maybe-all-stageautoprofile-libelf
 configure-stageautofeedback-gcc: maybe-all-stageautofeedback-libelf
 configure-gcc: maybe-all-libiconv
-
 configure-stage1-gcc: maybe-all-stage1-libiconv
 configure-stage2-gcc: maybe-all-stage2-libiconv
 configure-stage3-gcc: maybe-all-stage3-libiconv
@@ -56999,7 +58126,6 @@ configure-stagefeedback-gcc: maybe-all-stagefeedback-libiconv
 configure-stageautoprofile-gcc: maybe-all-stageautoprofile-libiconv
 configure-stageautofeedback-gcc: maybe-all-stageautofeedback-libiconv
 all-gcc: all-libiberty
-
 all-stage1-gcc: all-stage1-libiberty
 all-stage2-gcc: all-stage2-libiberty
 all-stage3-gcc: all-stage3-libiberty
@@ -57010,7 +58136,6 @@ all-stagefeedback-gcc: all-stagefeedback-libiberty
 all-stageautoprofile-gcc: all-stageautoprofile-libiberty
 all-stageautofeedback-gcc: all-stageautofeedback-libiberty
 all-gcc: maybe-all-intl
-
 all-stage1-gcc: maybe-all-stage1-intl
 all-stage2-gcc: maybe-all-stage2-intl
 all-stage3-gcc: maybe-all-stage3-intl
@@ -57021,7 +58146,6 @@ all-stagefeedback-gcc: maybe-all-stagefeedback-intl
 all-stageautoprofile-gcc: maybe-all-stageautoprofile-intl
 all-stageautofeedback-gcc: maybe-all-stageautofeedback-intl
 all-gcc: maybe-all-mpfr
-
 all-stage1-gcc: maybe-all-stage1-mpfr
 all-stage2-gcc: maybe-all-stage2-mpfr
 all-stage3-gcc: maybe-all-stage3-mpfr
@@ -57032,7 +58156,6 @@ all-stagefeedback-gcc: maybe-all-stagefeedback-mpfr
 all-stageautoprofile-gcc: maybe-all-stageautoprofile-mpfr
 all-stageautofeedback-gcc: maybe-all-stageautofeedback-mpfr
 all-gcc: maybe-all-mpc
-
 all-stage1-gcc: maybe-all-stage1-mpc
 all-stage2-gcc: maybe-all-stage2-mpc
 all-stage3-gcc: maybe-all-stage3-mpc
@@ -57043,7 +58166,6 @@ all-stagefeedback-gcc: maybe-all-stagefeedback-mpc
 all-stageautoprofile-gcc: maybe-all-stageautoprofile-mpc
 all-stageautofeedback-gcc: maybe-all-stageautofeedback-mpc
 all-gcc: maybe-all-isl
-
 all-stage1-gcc: maybe-all-stage1-isl
 all-stage2-gcc: maybe-all-stage2-isl
 all-stage3-gcc: maybe-all-stage3-isl
@@ -57054,7 +58176,6 @@ all-stagefeedback-gcc: maybe-all-stagefeedback-isl
 all-stageautoprofile-gcc: maybe-all-stageautoprofile-isl
 all-stageautofeedback-gcc: maybe-all-stageautofeedback-isl
 all-gcc: maybe-all-build-texinfo
-
 all-stage1-gcc: maybe-all-build-texinfo
 all-stage2-gcc: maybe-all-build-texinfo
 all-stage3-gcc: maybe-all-build-texinfo
@@ -57065,7 +58186,6 @@ all-stagefeedback-gcc: maybe-all-build-texinfo
 all-stageautoprofile-gcc: maybe-all-build-texinfo
 all-stageautofeedback-gcc: maybe-all-build-texinfo
 all-gcc: maybe-all-build-bison
-
 all-stage1-gcc: maybe-all-build-bison
 all-stage2-gcc: maybe-all-build-bison
 all-stage3-gcc: maybe-all-build-bison
@@ -57076,7 +58196,6 @@ all-stagefeedback-gcc: maybe-all-build-bison
 all-stageautoprofile-gcc: maybe-all-build-bison
 all-stageautofeedback-gcc: maybe-all-build-bison
 all-gcc: maybe-all-build-flex
-
 all-stage1-gcc: maybe-all-build-flex
 all-stage2-gcc: maybe-all-build-flex
 all-stage3-gcc: maybe-all-build-flex
@@ -57087,7 +58206,6 @@ all-stagefeedback-gcc: maybe-all-build-flex
 all-stageautoprofile-gcc: maybe-all-build-flex
 all-stageautofeedback-gcc: maybe-all-build-flex
 all-gcc: maybe-all-build-libiberty
-
 all-stage1-gcc: maybe-all-build-libiberty
 all-stage2-gcc: maybe-all-build-libiberty
 all-stage3-gcc: maybe-all-build-libiberty
@@ -57098,7 +58216,6 @@ all-stagefeedback-gcc: maybe-all-build-libiberty
 all-stageautoprofile-gcc: maybe-all-build-libiberty
 all-stageautofeedback-gcc: maybe-all-build-libiberty
 all-gcc: maybe-all-build-fixincludes
-
 all-stage1-gcc: maybe-all-build-fixincludes
 all-stage2-gcc: maybe-all-build-fixincludes
 all-stage3-gcc: maybe-all-build-fixincludes
@@ -57109,7 +58226,6 @@ all-stagefeedback-gcc: maybe-all-build-fixincludes
 all-stageautoprofile-gcc: maybe-all-build-fixincludes
 all-stageautofeedback-gcc: maybe-all-build-fixincludes
 all-gcc: maybe-all-build-libcpp
-
 all-stage1-gcc: maybe-all-build-libcpp
 all-stage2-gcc: maybe-all-build-libcpp
 all-stage3-gcc: maybe-all-build-libcpp
@@ -57120,7 +58236,6 @@ all-stagefeedback-gcc: maybe-all-build-libcpp
 all-stageautoprofile-gcc: maybe-all-build-libcpp
 all-stageautofeedback-gcc: maybe-all-build-libcpp
 all-gcc: maybe-all-zlib
-
 all-stage1-gcc: maybe-all-stage1-zlib
 all-stage2-gcc: maybe-all-stage2-zlib
 all-stage3-gcc: maybe-all-stage3-zlib
@@ -57131,7 +58246,6 @@ all-stagefeedback-gcc: maybe-all-stagefeedback-zlib
 all-stageautoprofile-gcc: maybe-all-stageautoprofile-zlib
 all-stageautofeedback-gcc: maybe-all-stageautofeedback-zlib
 all-gcc: all-libbacktrace
-
 all-stage1-gcc: all-stage1-libbacktrace
 all-stage2-gcc: all-stage2-libbacktrace
 all-stage3-gcc: all-stage3-libbacktrace
@@ -57142,7 +58256,6 @@ all-stagefeedback-gcc: all-stagefeedback-libbacktrace
 all-stageautoprofile-gcc: all-stageautoprofile-libbacktrace
 all-stageautofeedback-gcc: all-stageautofeedback-libbacktrace
 all-gcc: all-libcpp
-
 all-stage1-gcc: all-stage1-libcpp
 all-stage2-gcc: all-stage2-libcpp
 all-stage3-gcc: all-stage3-libcpp
@@ -57153,7 +58266,6 @@ all-stagefeedback-gcc: all-stagefeedback-libcpp
 all-stageautoprofile-gcc: all-stageautoprofile-libcpp
 all-stageautofeedback-gcc: all-stageautofeedback-libcpp
 all-gcc: all-libdecnumber
-
 all-stage1-gcc: all-stage1-libdecnumber
 all-stage2-gcc: all-stage2-libdecnumber
 all-stage3-gcc: all-stage3-libdecnumber
@@ -57164,7 +58276,6 @@ all-stagefeedback-gcc: all-stagefeedback-libdecnumber
 all-stageautoprofile-gcc: all-stageautoprofile-libdecnumber
 all-stageautofeedback-gcc: all-stageautofeedback-libdecnumber
 all-gcc: maybe-all-libiberty
-
 all-stage1-gcc: maybe-all-stage1-libiberty
 all-stage2-gcc: maybe-all-stage2-libiberty
 all-stage3-gcc: maybe-all-stage3-libiberty
@@ -57175,7 +58286,6 @@ all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty
 all-stageautoprofile-gcc: maybe-all-stageautoprofile-libiberty
 all-stageautofeedback-gcc: maybe-all-stageautofeedback-libiberty
 all-gcc: maybe-all-fixincludes
-
 all-stage1-gcc: maybe-all-stage1-fixincludes
 all-stage2-gcc: maybe-all-stage2-fixincludes
 all-stage3-gcc: maybe-all-stage3-fixincludes
@@ -57186,7 +58296,6 @@ all-stagefeedback-gcc: maybe-all-stagefeedback-fixincludes
 all-stageautoprofile-gcc: maybe-all-stageautoprofile-fixincludes
 all-stageautofeedback-gcc: maybe-all-stageautofeedback-fixincludes
 all-gcc: maybe-all-lto-plugin
-
 all-stage1-gcc: maybe-all-stage1-lto-plugin
 all-stage2-gcc: maybe-all-stage2-lto-plugin
 all-stage3-gcc: maybe-all-stage3-lto-plugin
@@ -57197,7 +58306,6 @@ all-stagefeedback-gcc: maybe-all-stagefeedback-lto-plugin
 all-stageautoprofile-gcc: maybe-all-stageautoprofile-lto-plugin
 all-stageautofeedback-gcc: maybe-all-stageautofeedback-lto-plugin
 all-gcc: maybe-all-libiconv
-
 all-stage1-gcc: maybe-all-stage1-libiconv
 all-stage2-gcc: maybe-all-stage2-libiconv
 all-stage3-gcc: maybe-all-stage3-libiconv
@@ -57208,7 +58316,6 @@ all-stagefeedback-gcc: maybe-all-stagefeedback-libiconv
 all-stageautoprofile-gcc: maybe-all-stageautoprofile-libiconv
 all-stageautofeedback-gcc: maybe-all-stageautofeedback-libiconv
 info-gcc: maybe-all-build-libiberty
-
 info-stage1-gcc: maybe-all-build-libiberty
 info-stage2-gcc: maybe-all-build-libiberty
 info-stage3-gcc: maybe-all-build-libiberty
@@ -57219,7 +58326,6 @@ info-stagefeedback-gcc: maybe-all-build-libiberty
 info-stageautoprofile-gcc: maybe-all-build-libiberty
 info-stageautofeedback-gcc: maybe-all-build-libiberty
 dvi-gcc: maybe-all-build-libiberty
-
 dvi-stage1-gcc: maybe-all-build-libiberty
 dvi-stage2-gcc: maybe-all-build-libiberty
 dvi-stage3-gcc: maybe-all-build-libiberty
@@ -57230,7 +58336,6 @@ dvi-stagefeedback-gcc: maybe-all-build-libiberty
 dvi-stageautoprofile-gcc: maybe-all-build-libiberty
 dvi-stageautofeedback-gcc: maybe-all-build-libiberty
 pdf-gcc: maybe-all-build-libiberty
-
 pdf-stage1-gcc: maybe-all-build-libiberty
 pdf-stage2-gcc: maybe-all-build-libiberty
 pdf-stage3-gcc: maybe-all-build-libiberty
@@ -57241,7 +58346,6 @@ pdf-stagefeedback-gcc: maybe-all-build-libiberty
 pdf-stageautoprofile-gcc: maybe-all-build-libiberty
 pdf-stageautofeedback-gcc: maybe-all-build-libiberty
 html-gcc: maybe-all-build-libiberty
-
 html-stage1-gcc: maybe-all-build-libiberty
 html-stage2-gcc: maybe-all-build-libiberty
 html-stage3-gcc: maybe-all-build-libiberty
@@ -57256,7 +58360,6 @@ install-gcc: maybe-install-lto-plugin
 install-strip-gcc: maybe-install-strip-fixincludes
 install-strip-gcc: maybe-install-strip-lto-plugin
 configure-libcpp: configure-libiberty
-
 configure-stage1-libcpp: configure-stage1-libiberty
 configure-stage2-libcpp: configure-stage2-libiberty
 configure-stage3-libcpp: configure-stage3-libiberty
@@ -57267,7 +58370,6 @@ configure-stagefeedback-libcpp: configure-stagefeedback-libiberty
 configure-stageautoprofile-libcpp: configure-stageautoprofile-libiberty
 configure-stageautofeedback-libcpp: configure-stageautofeedback-libiberty
 configure-libcpp: maybe-configure-intl
-
 configure-stage1-libcpp: maybe-configure-stage1-intl
 configure-stage2-libcpp: maybe-configure-stage2-intl
 configure-stage3-libcpp: maybe-configure-stage3-intl
@@ -57278,7 +58380,6 @@ configure-stagefeedback-libcpp: maybe-configure-stagefeedback-intl
 configure-stageautoprofile-libcpp: maybe-configure-stageautoprofile-intl
 configure-stageautofeedback-libcpp: maybe-configure-stageautofeedback-intl
 configure-libcpp: maybe-all-libiconv
-
 configure-stage1-libcpp: maybe-all-stage1-libiconv
 configure-stage2-libcpp: maybe-all-stage2-libiconv
 configure-stage3-libcpp: maybe-all-stage3-libiconv
@@ -57289,7 +58390,6 @@ configure-stagefeedback-libcpp: maybe-all-stagefeedback-libiconv
 configure-stageautoprofile-libcpp: maybe-all-stageautoprofile-libiconv
 configure-stageautofeedback-libcpp: maybe-all-stageautofeedback-libiconv
 all-libcpp: all-libiberty
-
 all-stage1-libcpp: all-stage1-libiberty
 all-stage2-libcpp: all-stage2-libiberty
 all-stage3-libcpp: all-stage3-libiberty
@@ -57300,7 +58400,6 @@ all-stagefeedback-libcpp: all-stagefeedback-libiberty
 all-stageautoprofile-libcpp: all-stageautoprofile-libiberty
 all-stageautofeedback-libcpp: all-stageautofeedback-libiberty
 all-libcpp: maybe-all-intl
-
 all-stage1-libcpp: maybe-all-stage1-intl
 all-stage2-libcpp: maybe-all-stage2-intl
 all-stage3-libcpp: maybe-all-stage3-intl
@@ -57311,7 +58410,6 @@ all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
 all-stageautoprofile-libcpp: maybe-all-stageautoprofile-intl
 all-stageautofeedback-libcpp: maybe-all-stageautofeedback-intl
 all-libcpp: maybe-all-libiconv
-
 all-stage1-libcpp: maybe-all-stage1-libiconv
 all-stage2-libcpp: maybe-all-stage2-libiconv
 all-stage3-libcpp: maybe-all-stage3-libiconv
@@ -57322,7 +58420,6 @@ all-stagefeedback-libcpp: maybe-all-stagefeedback-libiconv
 all-stageautoprofile-libcpp: maybe-all-stageautoprofile-libiconv
 all-stageautofeedback-libcpp: maybe-all-stageautofeedback-libiconv
 all-fixincludes: maybe-all-libiberty
-
 all-stage1-fixincludes: maybe-all-stage1-libiberty
 all-stage2-fixincludes: maybe-all-stage2-libiberty
 all-stage3-fixincludes: maybe-all-stage3-libiberty
@@ -57333,9 +58430,7 @@ all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
 all-stageautoprofile-fixincludes: maybe-all-stageautoprofile-libiberty
 all-stageautofeedback-fixincludes: maybe-all-stageautofeedback-libiberty
 all-gnattools: maybe-all-target-libada
-all-gnattools: maybe-all-target-libstdc++-v3
 all-lto-plugin: maybe-all-libiberty
-
 all-stage1-lto-plugin: maybe-all-stage1-libiberty
 all-stage2-lto-plugin: maybe-all-stage2-libiberty
 all-stage3-lto-plugin: maybe-all-stage3-libiberty
@@ -57346,7 +58441,6 @@ all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty
 all-stageautoprofile-lto-plugin: maybe-all-stageautoprofile-libiberty
 all-stageautofeedback-lto-plugin: maybe-all-stageautofeedback-libiberty
 all-lto-plugin: maybe-all-libiberty-linker-plugin
-
 all-stage1-lto-plugin: maybe-all-stage1-libiberty-linker-plugin
 all-stage2-lto-plugin: maybe-all-stage2-libiberty-linker-plugin
 all-stage3-lto-plugin: maybe-all-stage3-libiberty-linker-plugin
@@ -57356,12 +58450,8 @@ all-stagetrain-lto-plugin: maybe-all-stagetrain-libiberty-linker-plugin
 all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty-linker-plugin
 all-stageautoprofile-lto-plugin: maybe-all-stageautoprofile-libiberty-linker-plugin
 all-stageautofeedback-lto-plugin: maybe-all-stageautofeedback-libiberty-linker-plugin
-configure-libcc1: maybe-configure-gcc
-all-libcc1: maybe-all-gcc
 all-gotools: maybe-all-target-libgo
-all-utils: maybe-all-libiberty
 configure-intl: maybe-all-libiconv
-
 configure-stage1-intl: maybe-all-stage1-libiconv
 configure-stage2-intl: maybe-all-stage2-libiconv
 configure-stage3-intl: maybe-all-stage3-libiconv
@@ -57372,7 +58462,6 @@ configure-stagefeedback-intl: maybe-all-stagefeedback-libiconv
 configure-stageautoprofile-intl: maybe-all-stageautoprofile-libiconv
 configure-stageautofeedback-intl: maybe-all-stageautofeedback-libiconv
 configure-mpfr: maybe-all-gmp
-
 configure-stage1-mpfr: maybe-all-stage1-gmp
 configure-stage2-mpfr: maybe-all-stage2-gmp
 configure-stage3-mpfr: maybe-all-stage3-gmp
@@ -57383,7 +58472,6 @@ configure-stagefeedback-mpfr: maybe-all-stagefeedback-gmp
 configure-stageautoprofile-mpfr: maybe-all-stageautoprofile-gmp
 configure-stageautofeedback-mpfr: maybe-all-stageautofeedback-gmp
 configure-mpc: maybe-all-mpfr
-
 configure-stage1-mpc: maybe-all-stage1-mpfr
 configure-stage2-mpc: maybe-all-stage2-mpfr
 configure-stage3-mpc: maybe-all-stage3-mpfr
@@ -57394,7 +58482,6 @@ configure-stagefeedback-mpc: maybe-all-stagefeedback-mpfr
 configure-stageautoprofile-mpc: maybe-all-stageautoprofile-mpfr
 configure-stageautofeedback-mpc: maybe-all-stageautofeedback-mpfr
 configure-isl: maybe-all-gmp
-
 configure-stage1-isl: maybe-all-stage1-gmp
 configure-stage2-isl: maybe-all-stage2-gmp
 configure-stage3-isl: maybe-all-stage3-gmp
@@ -57405,7 +58492,6 @@ configure-stagefeedback-isl: maybe-all-stagefeedback-gmp
 configure-stageautoprofile-isl: maybe-all-stageautoprofile-gmp
 configure-stageautofeedback-isl: maybe-all-stageautofeedback-gmp
 all-intl: maybe-all-libiconv
-
 all-stage1-intl: maybe-all-stage1-libiconv
 all-stage2-intl: maybe-all-stage2-libiconv
 all-stage3-intl: maybe-all-stage3-libiconv
@@ -57415,17 +58501,12 @@ all-stagetrain-intl: maybe-all-stagetrain-libiconv
 all-stagefeedback-intl: maybe-all-stagefeedback-libiconv
 all-stageautoprofile-intl: maybe-all-stageautoprofile-libiconv
 all-stageautofeedback-intl: maybe-all-stageautofeedback-libiconv
-configure-gdb: maybe-all-intl
 configure-gdb: maybe-configure-sim
-configure-gdb: maybe-all-bfd
-configure-gdb: maybe-all-libiconv
-all-gdb: maybe-all-libiberty
-all-gdb: maybe-all-libiconv
-all-gdb: maybe-all-opcodes
+configure-gdb: maybe-all-gnulib
+all-gdb: maybe-all-gnulib
 all-gdb: maybe-all-readline
 all-gdb: maybe-all-build-bison
 all-gdb: maybe-all-sim
-all-gdb: maybe-all-libdecnumber
 all-gdb: maybe-all-libtermcap
 configure-libgui: maybe-configure-tcl
 configure-libgui: maybe-configure-tk
@@ -57433,7 +58514,6 @@ all-libgui: maybe-all-tcl
 all-libgui: maybe-all-tk
 all-libgui: maybe-all-itcl
 configure-bfd: configure-libiberty
-
 configure-stage1-bfd: configure-stage1-libiberty
 configure-stage2-bfd: configure-stage2-libiberty
 configure-stage3-bfd: configure-stage3-libiberty
@@ -57444,7 +58524,6 @@ configure-stagefeedback-bfd: configure-stagefeedback-libiberty
 configure-stageautoprofile-bfd: configure-stageautoprofile-libiberty
 configure-stageautofeedback-bfd: configure-stageautofeedback-libiberty
 configure-bfd: maybe-configure-intl
-
 configure-stage1-bfd: maybe-configure-stage1-intl
 configure-stage2-bfd: maybe-configure-stage2-intl
 configure-stage3-bfd: maybe-configure-stage3-intl
@@ -57455,7 +58534,6 @@ configure-stagefeedback-bfd: maybe-configure-stagefeedback-intl
 configure-stageautoprofile-bfd: maybe-configure-stageautoprofile-intl
 configure-stageautofeedback-bfd: maybe-configure-stageautofeedback-intl
 all-bfd: maybe-all-libiberty
-
 all-stage1-bfd: maybe-all-stage1-libiberty
 all-stage2-bfd: maybe-all-stage2-libiberty
 all-stage3-bfd: maybe-all-stage3-libiberty
@@ -57466,7 +58544,6 @@ all-stagefeedback-bfd: maybe-all-stagefeedback-libiberty
 all-stageautoprofile-bfd: maybe-all-stageautoprofile-libiberty
 all-stageautofeedback-bfd: maybe-all-stageautofeedback-libiberty
 all-bfd: maybe-all-intl
-
 all-stage1-bfd: maybe-all-stage1-intl
 all-stage2-bfd: maybe-all-stage2-intl
 all-stage3-bfd: maybe-all-stage3-intl
@@ -57477,7 +58554,6 @@ all-stagefeedback-bfd: maybe-all-stagefeedback-intl
 all-stageautoprofile-bfd: maybe-all-stageautoprofile-intl
 all-stageautofeedback-bfd: maybe-all-stageautofeedback-intl
 all-bfd: maybe-all-zlib
-
 all-stage1-bfd: maybe-all-stage1-zlib
 all-stage2-bfd: maybe-all-stage2-zlib
 all-stage3-bfd: maybe-all-stage3-zlib
@@ -57488,7 +58564,6 @@ all-stagefeedback-bfd: maybe-all-stagefeedback-zlib
 all-stageautoprofile-bfd: maybe-all-stageautoprofile-zlib
 all-stageautofeedback-bfd: maybe-all-stageautofeedback-zlib
 configure-opcodes: configure-libiberty
-
 configure-stage1-opcodes: configure-stage1-libiberty
 configure-stage2-opcodes: configure-stage2-libiberty
 configure-stage3-opcodes: configure-stage3-libiberty
@@ -57499,7 +58574,6 @@ configure-stagefeedback-opcodes: configure-stagefeedback-libiberty
 configure-stageautoprofile-opcodes: configure-stageautoprofile-libiberty
 configure-stageautofeedback-opcodes: configure-stageautofeedback-libiberty
 all-opcodes: maybe-all-libiberty
-
 all-stage1-opcodes: maybe-all-stage1-libiberty
 all-stage2-opcodes: maybe-all-stage2-libiberty
 all-stage3-opcodes: maybe-all-stage3-libiberty
@@ -57510,7 +58584,6 @@ all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
 all-stageautoprofile-opcodes: maybe-all-stageautoprofile-libiberty
 all-stageautofeedback-opcodes: maybe-all-stageautofeedback-libiberty
 configure-binutils: maybe-configure-intl
-
 configure-stage1-binutils: maybe-configure-stage1-intl
 configure-stage2-binutils: maybe-configure-stage2-intl
 configure-stage3-binutils: maybe-configure-stage3-intl
@@ -57521,7 +58594,6 @@ configure-stagefeedback-binutils: maybe-configure-stagefeedback-intl
 configure-stageautoprofile-binutils: maybe-configure-stageautoprofile-intl
 configure-stageautofeedback-binutils: maybe-configure-stageautofeedback-intl
 all-binutils: maybe-all-libiberty
-
 all-stage1-binutils: maybe-all-stage1-libiberty
 all-stage2-binutils: maybe-all-stage2-libiberty
 all-stage3-binutils: maybe-all-stage3-libiberty
@@ -57532,7 +58604,6 @@ all-stagefeedback-binutils: maybe-all-stagefeedback-libiberty
 all-stageautoprofile-binutils: maybe-all-stageautoprofile-libiberty
 all-stageautofeedback-binutils: maybe-all-stageautofeedback-libiberty
 all-binutils: maybe-all-opcodes
-
 all-stage1-binutils: maybe-all-stage1-opcodes
 all-stage2-binutils: maybe-all-stage2-opcodes
 all-stage3-binutils: maybe-all-stage3-opcodes
@@ -57543,7 +58614,6 @@ all-stagefeedback-binutils: maybe-all-stagefeedback-opcodes
 all-stageautoprofile-binutils: maybe-all-stageautoprofile-opcodes
 all-stageautofeedback-binutils: maybe-all-stageautofeedback-opcodes
 all-binutils: maybe-all-bfd
-
 all-stage1-binutils: maybe-all-stage1-bfd
 all-stage2-binutils: maybe-all-stage2-bfd
 all-stage3-binutils: maybe-all-stage3-bfd
@@ -57554,7 +58624,6 @@ all-stagefeedback-binutils: maybe-all-stagefeedback-bfd
 all-stageautoprofile-binutils: maybe-all-stageautoprofile-bfd
 all-stageautofeedback-binutils: maybe-all-stageautofeedback-bfd
 all-binutils: maybe-all-build-flex
-
 all-stage1-binutils: maybe-all-build-flex
 all-stage2-binutils: maybe-all-build-flex
 all-stage3-binutils: maybe-all-build-flex
@@ -57565,7 +58634,6 @@ all-stagefeedback-binutils: maybe-all-build-flex
 all-stageautoprofile-binutils: maybe-all-build-flex
 all-stageautofeedback-binutils: maybe-all-build-flex
 all-binutils: maybe-all-build-bison
-
 all-stage1-binutils: maybe-all-build-bison
 all-stage2-binutils: maybe-all-build-bison
 all-stage3-binutils: maybe-all-build-bison
@@ -57576,7 +58644,6 @@ all-stagefeedback-binutils: maybe-all-build-bison
 all-stageautoprofile-binutils: maybe-all-build-bison
 all-stageautofeedback-binutils: maybe-all-build-bison
 all-binutils: maybe-all-intl
-
 all-stage1-binutils: maybe-all-stage1-intl
 all-stage2-binutils: maybe-all-stage2-intl
 all-stage3-binutils: maybe-all-stage3-intl
@@ -57587,7 +58654,6 @@ all-stagefeedback-binutils: maybe-all-stagefeedback-intl
 all-stageautoprofile-binutils: maybe-all-stageautoprofile-intl
 all-stageautofeedback-binutils: maybe-all-stageautofeedback-intl
 all-binutils: maybe-all-gas
-
 all-stage1-binutils: maybe-all-stage1-gas
 all-stage2-binutils: maybe-all-stage2-gas
 all-stage3-binutils: maybe-all-stage3-gas
@@ -57597,12 +58663,21 @@ all-stagetrain-binutils: maybe-all-stagetrain-gas
 all-stagefeedback-binutils: maybe-all-stagefeedback-gas
 all-stageautoprofile-binutils: maybe-all-stageautoprofile-gas
 all-stageautofeedback-binutils: maybe-all-stageautofeedback-gas
+all-binutils: maybe-all-libctf
+all-stage1-binutils: maybe-all-stage1-libctf
+all-stage2-binutils: maybe-all-stage2-libctf
+all-stage3-binutils: maybe-all-stage3-libctf
+all-stage4-binutils: maybe-all-stage4-libctf
+all-stageprofile-binutils: maybe-all-stageprofile-libctf
+all-stagetrain-binutils: maybe-all-stagetrain-libctf
+all-stagefeedback-binutils: maybe-all-stagefeedback-libctf
+all-stageautoprofile-binutils: maybe-all-stageautoprofile-libctf
+all-stageautofeedback-binutils: maybe-all-stageautofeedback-libctf
 install-binutils: maybe-install-opcodes
 install-strip-binutils: maybe-install-strip-opcodes
 install-opcodes: maybe-install-bfd
 install-strip-opcodes: maybe-install-strip-bfd
 configure-gas: maybe-configure-intl
-
 configure-stage1-gas: maybe-configure-stage1-intl
 configure-stage2-gas: maybe-configure-stage2-intl
 configure-stage3-gas: maybe-configure-stage3-intl
@@ -57613,7 +58688,6 @@ configure-stagefeedback-gas: maybe-configure-stagefeedback-intl
 configure-stageautoprofile-gas: maybe-configure-stageautoprofile-intl
 configure-stageautofeedback-gas: maybe-configure-stageautofeedback-intl
 all-gas: maybe-all-libiberty
-
 all-stage1-gas: maybe-all-stage1-libiberty
 all-stage2-gas: maybe-all-stage2-libiberty
 all-stage3-gas: maybe-all-stage3-libiberty
@@ -57624,7 +58698,6 @@ all-stagefeedback-gas: maybe-all-stagefeedback-libiberty
 all-stageautoprofile-gas: maybe-all-stageautoprofile-libiberty
 all-stageautofeedback-gas: maybe-all-stageautofeedback-libiberty
 all-gas: maybe-all-opcodes
-
 all-stage1-gas: maybe-all-stage1-opcodes
 all-stage2-gas: maybe-all-stage2-opcodes
 all-stage3-gas: maybe-all-stage3-opcodes
@@ -57635,7 +58708,6 @@ all-stagefeedback-gas: maybe-all-stagefeedback-opcodes
 all-stageautoprofile-gas: maybe-all-stageautoprofile-opcodes
 all-stageautofeedback-gas: maybe-all-stageautofeedback-opcodes
 all-gas: maybe-all-bfd
-
 all-stage1-gas: maybe-all-stage1-bfd
 all-stage2-gas: maybe-all-stage2-bfd
 all-stage3-gas: maybe-all-stage3-bfd
@@ -57646,7 +58718,6 @@ all-stagefeedback-gas: maybe-all-stagefeedback-bfd
 all-stageautoprofile-gas: maybe-all-stageautoprofile-bfd
 all-stageautofeedback-gas: maybe-all-stageautofeedback-bfd
 all-gas: maybe-all-intl
-
 all-stage1-gas: maybe-all-stage1-intl
 all-stage2-gas: maybe-all-stage2-intl
 all-stage3-gas: maybe-all-stage3-intl
@@ -57656,14 +58727,7 @@ all-stagetrain-gas: maybe-all-stagetrain-intl
 all-stagefeedback-gas: maybe-all-stagefeedback-intl
 all-stageautoprofile-gas: maybe-all-stageautoprofile-intl
 all-stageautofeedback-gas: maybe-all-stageautofeedback-intl
-configure-gprof: maybe-configure-intl
-all-gprof: maybe-all-libiberty
-all-gprof: maybe-all-bfd
-all-gprof: maybe-all-opcodes
-all-gprof: maybe-all-intl
-all-gprof: maybe-all-gas
 configure-ld: maybe-configure-intl
-
 configure-stage1-ld: maybe-configure-stage1-intl
 configure-stage2-ld: maybe-configure-stage2-intl
 configure-stage3-ld: maybe-configure-stage3-intl
@@ -57674,7 +58738,6 @@ configure-stagefeedback-ld: maybe-configure-stagefeedback-intl
 configure-stageautoprofile-ld: maybe-configure-stageautoprofile-intl
 configure-stageautofeedback-ld: maybe-configure-stageautofeedback-intl
 all-ld: maybe-all-libiberty
-
 all-stage1-ld: maybe-all-stage1-libiberty
 all-stage2-ld: maybe-all-stage2-libiberty
 all-stage3-ld: maybe-all-stage3-libiberty
@@ -57685,7 +58748,6 @@ all-stagefeedback-ld: maybe-all-stagefeedback-libiberty
 all-stageautoprofile-ld: maybe-all-stageautoprofile-libiberty
 all-stageautofeedback-ld: maybe-all-stageautofeedback-libiberty
 all-ld: maybe-all-bfd
-
 all-stage1-ld: maybe-all-stage1-bfd
 all-stage2-ld: maybe-all-stage2-bfd
 all-stage3-ld: maybe-all-stage3-bfd
@@ -57696,7 +58758,6 @@ all-stagefeedback-ld: maybe-all-stagefeedback-bfd
 all-stageautoprofile-ld: maybe-all-stageautoprofile-bfd
 all-stageautofeedback-ld: maybe-all-stageautofeedback-bfd
 all-ld: maybe-all-opcodes
-
 all-stage1-ld: maybe-all-stage1-opcodes
 all-stage2-ld: maybe-all-stage2-opcodes
 all-stage3-ld: maybe-all-stage3-opcodes
@@ -57707,7 +58768,6 @@ all-stagefeedback-ld: maybe-all-stagefeedback-opcodes
 all-stageautoprofile-ld: maybe-all-stageautoprofile-opcodes
 all-stageautofeedback-ld: maybe-all-stageautofeedback-opcodes
 all-ld: maybe-all-build-bison
-
 all-stage1-ld: maybe-all-build-bison
 all-stage2-ld: maybe-all-build-bison
 all-stage3-ld: maybe-all-build-bison
@@ -57718,7 +58778,6 @@ all-stagefeedback-ld: maybe-all-build-bison
 all-stageautoprofile-ld: maybe-all-build-bison
 all-stageautofeedback-ld: maybe-all-build-bison
 all-ld: maybe-all-build-flex
-
 all-stage1-ld: maybe-all-build-flex
 all-stage2-ld: maybe-all-build-flex
 all-stage3-ld: maybe-all-build-flex
@@ -57729,7 +58788,6 @@ all-stagefeedback-ld: maybe-all-build-flex
 all-stageautoprofile-ld: maybe-all-build-flex
 all-stageautofeedback-ld: maybe-all-build-flex
 all-ld: maybe-all-intl
-
 all-stage1-ld: maybe-all-stage1-intl
 all-stage2-ld: maybe-all-stage2-intl
 all-stage3-ld: maybe-all-stage3-intl
@@ -57740,7 +58798,6 @@ all-stagefeedback-ld: maybe-all-stagefeedback-intl
 all-stageautoprofile-ld: maybe-all-stageautoprofile-intl
 all-stageautofeedback-ld: maybe-all-stageautofeedback-intl
 all-ld: maybe-all-gas
-
 all-stage1-ld: maybe-all-stage1-gas
 all-stage2-ld: maybe-all-stage2-gas
 all-stage3-ld: maybe-all-stage3-gas
@@ -57751,7 +58808,6 @@ all-stagefeedback-ld: maybe-all-stagefeedback-gas
 all-stageautoprofile-ld: maybe-all-stageautoprofile-gas
 all-stageautofeedback-ld: maybe-all-stageautofeedback-gas
 all-ld: maybe-all-binutils
-
 all-stage1-ld: maybe-all-stage1-binutils
 all-stage2-ld: maybe-all-stage2-binutils
 all-stage3-ld: maybe-all-stage3-binutils
@@ -57764,7 +58820,6 @@ all-stageautofeedback-ld: maybe-all-stageautofeedback-binutils
 install-ld: maybe-install-gold
 install-strip-ld: maybe-install-strip-gold
 configure-gold: maybe-configure-intl
-
 configure-stage1-gold: maybe-configure-stage1-intl
 configure-stage2-gold: maybe-configure-stage2-intl
 configure-stage3-gold: maybe-configure-stage3-intl
@@ -57775,7 +58830,6 @@ configure-stagefeedback-gold: maybe-configure-stagefeedback-intl
 configure-stageautoprofile-gold: maybe-configure-stageautoprofile-intl
 configure-stageautofeedback-gold: maybe-configure-stageautofeedback-intl
 all-gold: maybe-all-libiberty
-
 all-stage1-gold: maybe-all-stage1-libiberty
 all-stage2-gold: maybe-all-stage2-libiberty
 all-stage3-gold: maybe-all-stage3-libiberty
@@ -57786,7 +58840,6 @@ all-stagefeedback-gold: maybe-all-stagefeedback-libiberty
 all-stageautoprofile-gold: maybe-all-stageautoprofile-libiberty
 all-stageautofeedback-gold: maybe-all-stageautofeedback-libiberty
 all-gold: maybe-all-intl
-
 all-stage1-gold: maybe-all-stage1-intl
 all-stage2-gold: maybe-all-stage2-intl
 all-stage3-gold: maybe-all-stage3-intl
@@ -57797,7 +58850,6 @@ all-stagefeedback-gold: maybe-all-stagefeedback-intl
 all-stageautoprofile-gold: maybe-all-stageautoprofile-intl
 all-stageautofeedback-gold: maybe-all-stageautofeedback-intl
 all-gold: maybe-all-bfd
-
 all-stage1-gold: maybe-all-stage1-bfd
 all-stage2-gold: maybe-all-stage2-bfd
 all-stage3-gold: maybe-all-stage3-bfd
@@ -57808,7 +58860,6 @@ all-stagefeedback-gold: maybe-all-stagefeedback-bfd
 all-stageautoprofile-gold: maybe-all-stageautoprofile-bfd
 all-stageautofeedback-gold: maybe-all-stageautofeedback-bfd
 all-gold: maybe-all-build-bison
-
 all-stage1-gold: maybe-all-build-bison
 all-stage2-gold: maybe-all-build-bison
 all-stage3-gold: maybe-all-build-bison
@@ -57819,7 +58870,6 @@ all-stagefeedback-gold: maybe-all-build-bison
 all-stageautoprofile-gold: maybe-all-build-bison
 all-stageautofeedback-gold: maybe-all-build-bison
 all-gold: maybe-all-gas
-
 all-stage1-gold: maybe-all-stage1-gas
 all-stage2-gold: maybe-all-stage2-gas
 all-stage3-gold: maybe-all-stage3-gas
@@ -57830,7 +58880,6 @@ all-stagefeedback-gold: maybe-all-stagefeedback-gas
 all-stageautoprofile-gold: maybe-all-stageautoprofile-gas
 all-stageautofeedback-gold: maybe-all-stageautofeedback-gas
 check-gold: maybe-all-binutils
-
 check-stage1-gold: maybe-all-stage1-binutils
 check-stage2-gold: maybe-all-stage2-binutils
 check-stage3-gold: maybe-all-stage3-binutils
@@ -57841,7 +58890,6 @@ check-stagefeedback-gold: maybe-all-stagefeedback-binutils
 check-stageautoprofile-gold: maybe-all-stageautoprofile-binutils
 check-stageautofeedback-gold: maybe-all-stageautofeedback-binutils
 check-gold: maybe-all-gas
-
 check-stage1-gold: maybe-all-stage1-gas
 check-stage2-gold: maybe-all-stage2-gas
 check-stage3-gold: maybe-all-stage3-gas
@@ -57852,7 +58900,6 @@ check-stagefeedback-gold: maybe-all-stagefeedback-gas
 check-stageautoprofile-gold: maybe-all-stageautoprofile-gas
 check-stageautofeedback-gold: maybe-all-stageautofeedback-gas
 configure-opcodes: maybe-configure-intl
-
 configure-stage1-opcodes: maybe-configure-stage1-intl
 configure-stage2-opcodes: maybe-configure-stage2-intl
 configure-stage3-opcodes: maybe-configure-stage3-intl
@@ -57863,7 +58910,6 @@ configure-stagefeedback-opcodes: maybe-configure-stagefeedback-intl
 configure-stageautoprofile-opcodes: maybe-configure-stageautoprofile-intl
 configure-stageautofeedback-opcodes: maybe-configure-stageautofeedback-intl
 all-opcodes: maybe-all-bfd
-
 all-stage1-opcodes: maybe-all-stage1-bfd
 all-stage2-opcodes: maybe-all-stage2-bfd
 all-stage3-opcodes: maybe-all-stage3-bfd
@@ -57874,7 +58920,6 @@ all-stagefeedback-opcodes: maybe-all-stagefeedback-bfd
 all-stageautoprofile-opcodes: maybe-all-stageautoprofile-bfd
 all-stageautofeedback-opcodes: maybe-all-stageautofeedback-bfd
 all-opcodes: maybe-all-libiberty
-
 all-stage1-opcodes: maybe-all-stage1-libiberty
 all-stage2-opcodes: maybe-all-stage2-libiberty
 all-stage3-opcodes: maybe-all-stage3-libiberty
@@ -57885,7 +58930,6 @@ all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
 all-stageautoprofile-opcodes: maybe-all-stageautoprofile-libiberty
 all-stageautofeedback-opcodes: maybe-all-stageautofeedback-libiberty
 all-opcodes: maybe-all-intl
-
 all-stage1-opcodes: maybe-all-stage1-intl
 all-stage2-opcodes: maybe-all-stage2-intl
 all-stage3-opcodes: maybe-all-stage3-intl
@@ -57910,42 +58954,102 @@ install-itcl: maybe-install-tcl
 install-strip-itcl: maybe-install-strip-tcl
 configure-tk: maybe-configure-tcl
 all-tk: maybe-all-tcl
-all-sid: maybe-all-libiberty
-all-sid: maybe-all-bfd
-all-sid: maybe-all-opcodes
 all-sid: maybe-all-tcl
 all-sid: maybe-all-tk
 install-sid: maybe-install-tcl
 install-strip-sid: maybe-install-strip-tcl
 install-sid: maybe-install-tk
 install-strip-sid: maybe-install-strip-tk
-configure-sim: maybe-configure-intl
-all-sim: maybe-all-intl
-all-sim: maybe-all-libiberty
-all-sim: maybe-all-bfd
-all-sim: maybe-all-opcodes
 all-sim: maybe-all-readline
 all-sim: maybe-configure-gdb
-all-fastjar: maybe-all-zlib
 all-fastjar: maybe-all-build-texinfo
-all-fastjar: maybe-all-libiberty
-all-bison: maybe-all-intl
+all-libctf: all-libiberty
+all-stage1-libctf: all-stage1-libiberty
+all-stage2-libctf: all-stage2-libiberty
+all-stage3-libctf: all-stage3-libiberty
+all-stage4-libctf: all-stage4-libiberty
+all-stageprofile-libctf: all-stageprofile-libiberty
+all-stagetrain-libctf: all-stagetrain-libiberty
+all-stagefeedback-libctf: all-stagefeedback-libiberty
+all-stageautoprofile-libctf: all-stageautoprofile-libiberty
+all-stageautofeedback-libctf: all-stageautofeedback-libiberty
+all-libctf: maybe-all-bfd
+all-stage1-libctf: maybe-all-stage1-bfd
+all-stage2-libctf: maybe-all-stage2-bfd
+all-stage3-libctf: maybe-all-stage3-bfd
+all-stage4-libctf: maybe-all-stage4-bfd
+all-stageprofile-libctf: maybe-all-stageprofile-bfd
+all-stagetrain-libctf: maybe-all-stagetrain-bfd
+all-stagefeedback-libctf: maybe-all-stagefeedback-bfd
+all-stageautoprofile-libctf: maybe-all-stageautoprofile-bfd
+all-stageautofeedback-libctf: maybe-all-stageautofeedback-bfd
+all-libctf: maybe-all-zlib
+all-stage1-libctf: maybe-all-stage1-zlib
+all-stage2-libctf: maybe-all-stage2-zlib
+all-stage3-libctf: maybe-all-stage3-zlib
+all-stage4-libctf: maybe-all-stage4-zlib
+all-stageprofile-libctf: maybe-all-stageprofile-zlib
+all-stagetrain-libctf: maybe-all-stagetrain-zlib
+all-stagefeedback-libctf: maybe-all-stagefeedback-zlib
+all-stageautoprofile-libctf: maybe-all-stageautoprofile-zlib
+all-stageautofeedback-libctf: maybe-all-stageautofeedback-zlib
+configure-libctf: maybe-all-bfd
+configure-stage1-libctf: maybe-all-stage1-bfd
+configure-stage2-libctf: maybe-all-stage2-bfd
+configure-stage3-libctf: maybe-all-stage3-bfd
+configure-stage4-libctf: maybe-all-stage4-bfd
+configure-stageprofile-libctf: maybe-all-stageprofile-bfd
+configure-stagetrain-libctf: maybe-all-stagetrain-bfd
+configure-stagefeedback-libctf: maybe-all-stagefeedback-bfd
+configure-stageautoprofile-libctf: maybe-all-stageautoprofile-bfd
+configure-stageautofeedback-libctf: maybe-all-stageautofeedback-bfd
+configure-libctf: maybe-all-intl
+configure-stage1-libctf: maybe-all-stage1-intl
+configure-stage2-libctf: maybe-all-stage2-intl
+configure-stage3-libctf: maybe-all-stage3-intl
+configure-stage4-libctf: maybe-all-stage4-intl
+configure-stageprofile-libctf: maybe-all-stageprofile-intl
+configure-stagetrain-libctf: maybe-all-stagetrain-intl
+configure-stagefeedback-libctf: maybe-all-stagefeedback-intl
+configure-stageautoprofile-libctf: maybe-all-stageautoprofile-intl
+configure-stageautofeedback-libctf: maybe-all-stageautofeedback-intl
+configure-libctf: maybe-all-zlib
+configure-stage1-libctf: maybe-all-stage1-zlib
+configure-stage2-libctf: maybe-all-stage2-zlib
+configure-stage3-libctf: maybe-all-stage3-zlib
+configure-stage4-libctf: maybe-all-stage4-zlib
+configure-stageprofile-libctf: maybe-all-stageprofile-zlib
+configure-stagetrain-libctf: maybe-all-stagetrain-zlib
+configure-stagefeedback-libctf: maybe-all-stagefeedback-zlib
+configure-stageautoprofile-libctf: maybe-all-stageautoprofile-zlib
+configure-stageautofeedback-libctf: maybe-all-stageautofeedback-zlib
+configure-libctf: maybe-all-libiconv
+configure-stage1-libctf: maybe-all-stage1-libiconv
+configure-stage2-libctf: maybe-all-stage2-libiconv
+configure-stage3-libctf: maybe-all-stage3-libiconv
+configure-stage4-libctf: maybe-all-stage4-libiconv
+configure-stageprofile-libctf: maybe-all-stageprofile-libiconv
+configure-stagetrain-libctf: maybe-all-stagetrain-libiconv
+configure-stagefeedback-libctf: maybe-all-stagefeedback-libiconv
+configure-stageautoprofile-libctf: maybe-all-stageautoprofile-libiconv
+configure-stageautofeedback-libctf: maybe-all-stageautofeedback-libiconv
 all-bison: maybe-all-build-texinfo
 all-flex: maybe-all-build-bison
-all-flex: maybe-all-intl
 all-flex: maybe-all-m4
 all-flex: maybe-all-build-texinfo
-all-m4: maybe-all-intl
 all-m4: maybe-all-build-texinfo
 configure-target-fastjar: maybe-configure-target-zlib
 all-target-fastjar: maybe-all-target-zlib
 configure-target-libgo: maybe-configure-target-libffi
-configure-target-libgo: maybe-all-target-libstdc++-v3
 all-target-libgo: maybe-all-target-libbacktrace
 all-target-libgo: maybe-all-target-libffi
 all-target-libgo: maybe-all-target-libatomic
+configure-target-libphobos: maybe-configure-target-libbacktrace
+configure-target-libphobos: maybe-configure-target-zlib
+all-target-libphobos: maybe-all-target-libbacktrace
+all-target-libphobos: maybe-all-target-zlib
+all-target-libphobos: maybe-all-target-libatomic
 configure-target-libstdc++-v3: maybe-configure-target-libgomp
-
 configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
 configure-stage2-target-libstdc++-v3: maybe-configure-stage2-target-libgomp
 configure-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp
@@ -57955,9 +59059,7 @@ configure-stagetrain-target-libstdc++-v3: maybe-configure-stagetrain-target-libg
 configure-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp
 configure-stageautoprofile-target-libstdc++-v3: maybe-configure-stageautoprofile-target-libgomp
 configure-stageautofeedback-target-libstdc++-v3: maybe-configure-stageautofeedback-target-libgomp
-configure-target-liboffloadmic: maybe-configure-target-libgomp
 configure-target-libsanitizer: maybe-all-target-libstdc++-v3
-
 configure-stage1-target-libsanitizer: maybe-all-stage1-target-libstdc++-v3
 configure-stage2-target-libsanitizer: maybe-all-stage2-target-libstdc++-v3
 configure-stage3-target-libsanitizer: maybe-all-stage3-target-libstdc++-v3
@@ -57968,7 +59070,6 @@ configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-target-libs
 configure-stageautoprofile-target-libsanitizer: maybe-all-stageautoprofile-target-libstdc++-v3
 configure-stageautofeedback-target-libsanitizer: maybe-all-stageautofeedback-target-libstdc++-v3
 configure-target-libvtv: maybe-all-target-libstdc++-v3
-
 configure-stage1-target-libvtv: maybe-all-stage1-target-libstdc++-v3
 configure-stage2-target-libvtv: maybe-all-stage2-target-libstdc++-v3
 configure-stage3-target-libvtv: maybe-all-stage3-target-libstdc++-v3
@@ -57979,7 +59080,6 @@ configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libstdc++-
 configure-stageautoprofile-target-libvtv: maybe-all-stageautoprofile-target-libstdc++-v3
 configure-stageautofeedback-target-libvtv: maybe-all-stageautofeedback-target-libstdc++-v3
 all-target-libstdc++-v3: maybe-configure-target-libgomp
-
 all-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
 all-stage2-target-libstdc++-v3: maybe-configure-stage2-target-libgomp
 all-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp
@@ -57989,10 +59089,10 @@ all-stagetrain-target-libstdc++-v3: maybe-configure-stagetrain-target-libgomp
 all-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp
 all-stageautoprofile-target-libstdc++-v3: maybe-configure-stageautoprofile-target-libgomp
 all-stageautofeedback-target-libstdc++-v3: maybe-configure-stageautofeedback-target-libgomp
-all-target-liboffloadmic: maybe-all-target-libgomp
 install-target-libgo: maybe-install-target-libatomic
 install-target-libgfortran: maybe-install-target-libquadmath
 install-target-libgfortran: maybe-install-target-libgcc
+install-target-libphobos: maybe-install-target-libatomic
 install-target-libsanitizer: maybe-install-target-libstdc++-v3
 install-target-libsanitizer: maybe-install-target-libgcc
 install-target-libvtv: maybe-install-target-libstdc++-v3
@@ -58004,12 +59104,62 @@ install-target-libobjc: maybe-install-target-libgcc
 install-target-libstdc++-v3: maybe-install-target-libgcc
 all-target-libgloss: maybe-all-target-newlib
 all-target-winsup: maybe-all-target-libtermcap
-configure-target-newlib: maybe-all-binutils
-configure-target-newlib: maybe-all-ld
 configure-target-libgfortran: maybe-all-target-libquadmath
 configure-target-libgfortran: maybe-all-target-libbacktrace
 
 
+@if gcc-bootstrap
+configure-gnattools: stage_last
+configure-libcc1: stage_last
+configure-utils: stage_last
+configure-gdb: stage_last
+configure-gprof: stage_last
+configure-sid: stage_last
+configure-sim: stage_last
+configure-fastjar: stage_last
+configure-bison: stage_last
+configure-flex: stage_last
+configure-m4: stage_last
+@endif gcc-bootstrap
+
+@unless gcc-bootstrap
+all-gnattools: maybe-all-target-libstdc++-v3
+configure-libcc1: maybe-configure-gcc
+all-libcc1: maybe-all-gcc
+all-utils: maybe-all-libiberty
+configure-gdb: maybe-all-intl
+configure-gdb: maybe-all-bfd
+configure-gdb: maybe-all-libiconv
+all-gdb: maybe-all-libiberty
+all-gdb: maybe-all-libiconv
+all-gdb: maybe-all-opcodes
+all-gdb: maybe-all-libdecnumber
+configure-gprof: maybe-configure-intl
+all-gprof: maybe-all-libiberty
+all-gprof: maybe-all-bfd
+all-gprof: maybe-all-opcodes
+all-gprof: maybe-all-intl
+all-gprof: maybe-all-gas
+all-sid: maybe-all-libiberty
+all-sid: maybe-all-bfd
+all-sid: maybe-all-opcodes
+configure-sim: maybe-configure-intl
+all-sim: maybe-all-intl
+all-sim: maybe-all-libiberty
+all-sim: maybe-all-bfd
+all-sim: maybe-all-opcodes
+all-fastjar: maybe-all-zlib
+all-fastjar: maybe-all-libiberty
+all-bison: maybe-all-intl
+all-flex: maybe-all-intl
+all-m4: maybe-all-intl
+configure-target-libgo: maybe-all-target-libstdc++-v3
+configure-target-liboffloadmic: maybe-configure-target-libgomp
+all-target-liboffloadmic: maybe-all-target-libgomp
+configure-target-newlib: maybe-all-binutils
+configure-target-newlib: maybe-all-ld
+@endunless gcc-bootstrap
+
 # Dependencies for target modules on other target modules are
 # described by lang_env_dependencies; the defaults apply to anything
 # not mentioned there.
@@ -58034,15 +59184,6 @@ configure-stagetrain-target-libsanitizer: maybe-all-stagetrain-target-libgcc
 configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-target-libgcc
 configure-stageautoprofile-target-libsanitizer: maybe-all-stageautoprofile-target-libgcc
 configure-stageautofeedback-target-libsanitizer: maybe-all-stageautofeedback-target-libgcc
-configure-stage1-target-libmpx: maybe-all-stage1-target-libgcc
-configure-stage2-target-libmpx: maybe-all-stage2-target-libgcc
-configure-stage3-target-libmpx: maybe-all-stage3-target-libgcc
-configure-stage4-target-libmpx: maybe-all-stage4-target-libgcc
-configure-stageprofile-target-libmpx: maybe-all-stageprofile-target-libgcc
-configure-stagetrain-target-libmpx: maybe-all-stagetrain-target-libgcc
-configure-stagefeedback-target-libmpx: maybe-all-stagefeedback-target-libgcc
-configure-stageautoprofile-target-libmpx: maybe-all-stageautoprofile-target-libgcc
-configure-stageautofeedback-target-libmpx: maybe-all-stageautofeedback-target-libgcc
 configure-stage1-target-libvtv: maybe-all-stage1-target-libgcc
 configure-stage2-target-libvtv: maybe-all-stage2-target-libgcc
 configure-stage3-target-libvtv: maybe-all-stage3-target-libgcc
@@ -58066,7 +59207,6 @@ configure-stageautofeedback-target-libgomp: maybe-all-stageautofeedback-target-l
 @if gcc-no-bootstrap
 configure-target-libstdc++-v3: maybe-all-target-libgcc
 configure-target-libsanitizer: maybe-all-target-libgcc
-configure-target-libmpx: maybe-all-target-libgcc
 configure-target-libvtv: maybe-all-target-libgcc
 configure-target-liboffloadmic: maybe-all-target-libgcc
 configure-target-libssp: maybe-all-target-libgcc
@@ -58077,6 +59217,7 @@ configure-target-libgfortran: maybe-all-target-libgcc
 configure-target-libobjc: maybe-all-target-libgcc
 configure-target-libgo: maybe-all-target-libgcc
 configure-target-libhsail-rt: maybe-all-target-libgcc
+configure-target-libphobos: maybe-all-target-libgcc
 configure-target-libtermcap: maybe-all-target-libgcc
 configure-target-winsup: maybe-all-target-libgcc
 configure-target-libgloss: maybe-all-target-libgcc
@@ -58094,8 +59235,6 @@ configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-libsanitizer: maybe-all-target-newlib maybe-all-target-libgloss
 
-configure-target-libmpx: maybe-all-target-newlib maybe-all-target-libgloss
-
 configure-target-libvtv: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-liboffloadmic: maybe-all-target-newlib maybe-all-target-libgloss
@@ -58117,6 +59256,8 @@ configure-target-libgo: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-libhsail-rt: maybe-all-target-newlib maybe-all-target-libgloss
 
+configure-target-libphobos: maybe-all-target-newlib maybe-all-target-libgloss
+
 configure-target-libtermcap: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss