[Ada] Improved support for aspect alignment in CCG

[thirdparty/gcc.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 13d239153497882dff9f211796151bd51c290b00..36e369df6e7e2fb01e3e2adcf863faa08cc15ce4 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
 
@@ -529,11 +549,21 @@ STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
          --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" \
          --disable-build-format-warnings
 
+# When using the slow stage1 compiler disable IL verification and forcefully
+# enable it when using the stage2 compiler instead.  As we later compare
+# stage2 and stage3 we are merely avoid doing redundant work, plus we apply
+# checking when building all target libraries for release builds.
+STAGE1_TFLAGS += -fno-checking
+STAGE2_CFLAGS += -fno-checking
+STAGE2_TFLAGS += -fno-checking
+STAGE3_CFLAGS += -fchecking=1
+STAGE3_TFLAGS += -fchecking=1
+
 STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
 STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
 
-STAGEtrain_CFLAGS = $(STAGE3_CFLAGS)
-STAGEtrain_TFLAGS = $(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)
@@ -564,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@
 
@@ -571,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@
@@ -588,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@
@@ -612,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_libcilkrts)$(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:
@@ -622,18 +655,10 @@ 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
 
-@if target-libcilkrts
-TARGET_LIB_PATH_libcilkrts = $$r/$(TARGET_SUBDIR)/libcilkrts/.libs:
-@endif target-libcilkrts
-
 @if target-liboffloadmic
 TARGET_LIB_PATH_liboffloadmic = $$r/$(TARGET_SUBDIR)/liboffloadmic/.libs:
 @endif target-liboffloadmic
@@ -642,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
@@ -776,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)" \
@@ -787,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)" \
@@ -805,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)" \
@@ -849,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)' \
@@ -873,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}" \
@@ -905,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)' \
@@ -981,6 +1028,9 @@ configure-host:  \
     maybe-configure-sim \
     maybe-configure-texinfo \
     maybe-configure-zlib \
+    maybe-configure-gnulib \
+    maybe-configure-gdbsupport \
+    maybe-configure-gdbserver \
     maybe-configure-gdb \
     maybe-configure-expect \
     maybe-configure-guile \
@@ -990,14 +1040,13 @@ 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-libcilkrts \
     maybe-configure-target-liboffloadmic \
     maybe-configure-target-libssp \
     maybe-configure-target-newlib \
@@ -1008,6 +1057,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 \
@@ -1134,6 +1184,9 @@ 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-gdbsupport
+all-host: maybe-all-gdbserver
 all-host: maybe-all-gdb
 all-host: maybe-all-expect
 all-host: maybe-all-guile
@@ -1146,6 +1199,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
 
@@ -1155,13 +1211,9 @@ 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
-all-target: maybe-all-target-libcilkrts
 all-target: maybe-all-target-liboffloadmic
 all-target: maybe-all-target-libssp
 all-target: maybe-all-target-newlib
@@ -1174,6 +1226,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
@@ -1239,6 +1292,9 @@ 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-gdbsupport
+info-host: maybe-info-gdbserver
 info-host: maybe-info-gdb
 info-host: maybe-info-expect
 info-host: maybe-info-guile
@@ -1249,14 +1305,13 @@ 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-libcilkrts
 info-target: maybe-info-target-liboffloadmic
 info-target: maybe-info-target-libssp
 info-target: maybe-info-target-newlib
@@ -1267,6 +1322,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
@@ -1325,6 +1381,9 @@ 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-gdbsupport
+dvi-host: maybe-dvi-gdbserver
 dvi-host: maybe-dvi-gdb
 dvi-host: maybe-dvi-expect
 dvi-host: maybe-dvi-guile
@@ -1335,14 +1394,13 @@ 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-libcilkrts
 dvi-target: maybe-dvi-target-liboffloadmic
 dvi-target: maybe-dvi-target-libssp
 dvi-target: maybe-dvi-target-newlib
@@ -1353,6 +1411,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
@@ -1411,6 +1470,9 @@ 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-gdbsupport
+pdf-host: maybe-pdf-gdbserver
 pdf-host: maybe-pdf-gdb
 pdf-host: maybe-pdf-expect
 pdf-host: maybe-pdf-guile
@@ -1421,14 +1483,13 @@ 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-libcilkrts
 pdf-target: maybe-pdf-target-liboffloadmic
 pdf-target: maybe-pdf-target-libssp
 pdf-target: maybe-pdf-target-newlib
@@ -1439,6 +1500,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
@@ -1497,6 +1559,9 @@ 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-gdbsupport
+html-host: maybe-html-gdbserver
 html-host: maybe-html-gdb
 html-host: maybe-html-expect
 html-host: maybe-html-guile
@@ -1507,14 +1572,13 @@ 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-libcilkrts
 html-target: maybe-html-target-liboffloadmic
 html-target: maybe-html-target-libssp
 html-target: maybe-html-target-newlib
@@ -1525,6 +1589,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 +1648,9 @@ 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-gdbsupport
+TAGS-host: maybe-TAGS-gdbserver
 TAGS-host: maybe-TAGS-gdb
 TAGS-host: maybe-TAGS-expect
 TAGS-host: maybe-TAGS-guile
@@ -1593,14 +1661,13 @@ 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-libcilkrts
 TAGS-target: maybe-TAGS-target-liboffloadmic
 TAGS-target: maybe-TAGS-target-libssp
 TAGS-target: maybe-TAGS-target-newlib
@@ -1611,6 +1678,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
@@ -1669,6 +1737,9 @@ 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-gdbsupport
+install-info-host: maybe-install-info-gdbserver
 install-info-host: maybe-install-info-gdb
 install-info-host: maybe-install-info-expect
 install-info-host: maybe-install-info-guile
@@ -1679,14 +1750,13 @@ 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-libcilkrts
 install-info-target: maybe-install-info-target-liboffloadmic
 install-info-target: maybe-install-info-target-libssp
 install-info-target: maybe-install-info-target-newlib
@@ -1697,6 +1767,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
@@ -1755,6 +1826,9 @@ 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-gdbsupport
+install-pdf-host: maybe-install-pdf-gdbserver
 install-pdf-host: maybe-install-pdf-gdb
 install-pdf-host: maybe-install-pdf-expect
 install-pdf-host: maybe-install-pdf-guile
@@ -1765,14 +1839,13 @@ 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-libcilkrts
 install-pdf-target: maybe-install-pdf-target-liboffloadmic
 install-pdf-target: maybe-install-pdf-target-libssp
 install-pdf-target: maybe-install-pdf-target-newlib
@@ -1783,6 +1856,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
@@ -1841,6 +1915,9 @@ 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-gdbsupport
+install-html-host: maybe-install-html-gdbserver
 install-html-host: maybe-install-html-gdb
 install-html-host: maybe-install-html-expect
 install-html-host: maybe-install-html-guile
@@ -1851,14 +1928,13 @@ 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-libcilkrts
 install-html-target: maybe-install-html-target-liboffloadmic
 install-html-target: maybe-install-html-target-libssp
 install-html-target: maybe-install-html-target-newlib
@@ -1869,6 +1945,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
@@ -1927,6 +2004,9 @@ 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-gdbsupport
+installcheck-host: maybe-installcheck-gdbserver
 installcheck-host: maybe-installcheck-gdb
 installcheck-host: maybe-installcheck-expect
 installcheck-host: maybe-installcheck-guile
@@ -1937,14 +2017,13 @@ 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-libcilkrts
 installcheck-target: maybe-installcheck-target-liboffloadmic
 installcheck-target: maybe-installcheck-target-libssp
 installcheck-target: maybe-installcheck-target-newlib
@@ -1955,6 +2034,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
@@ -2013,6 +2093,9 @@ 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-gdbsupport
+mostlyclean-host: maybe-mostlyclean-gdbserver
 mostlyclean-host: maybe-mostlyclean-gdb
 mostlyclean-host: maybe-mostlyclean-expect
 mostlyclean-host: maybe-mostlyclean-guile
@@ -2023,14 +2106,13 @@ 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-libcilkrts
 mostlyclean-target: maybe-mostlyclean-target-liboffloadmic
 mostlyclean-target: maybe-mostlyclean-target-libssp
 mostlyclean-target: maybe-mostlyclean-target-newlib
@@ -2041,6 +2123,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
@@ -2099,6 +2182,9 @@ 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-gdbsupport
+clean-host: maybe-clean-gdbserver
 clean-host: maybe-clean-gdb
 clean-host: maybe-clean-expect
 clean-host: maybe-clean-guile
@@ -2109,14 +2195,13 @@ 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-libcilkrts
 clean-target: maybe-clean-target-liboffloadmic
 clean-target: maybe-clean-target-libssp
 clean-target: maybe-clean-target-newlib
@@ -2127,6 +2212,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
@@ -2185,6 +2271,9 @@ 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-gdbsupport
+distclean-host: maybe-distclean-gdbserver
 distclean-host: maybe-distclean-gdb
 distclean-host: maybe-distclean-expect
 distclean-host: maybe-distclean-guile
@@ -2195,14 +2284,13 @@ 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-libcilkrts
 distclean-target: maybe-distclean-target-liboffloadmic
 distclean-target: maybe-distclean-target-libssp
 distclean-target: maybe-distclean-target-newlib
@@ -2213,6 +2301,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
@@ -2271,6 +2360,9 @@ 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-gdbsupport
+maintainer-clean-host: maybe-maintainer-clean-gdbserver
 maintainer-clean-host: maybe-maintainer-clean-gdb
 maintainer-clean-host: maybe-maintainer-clean-expect
 maintainer-clean-host: maybe-maintainer-clean-guile
@@ -2281,14 +2373,13 @@ 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-libcilkrts
 maintainer-clean-target: maybe-maintainer-clean-target-liboffloadmic
 maintainer-clean-target: maybe-maintainer-clean-target-libssp
 maintainer-clean-target: maybe-maintainer-clean-target-newlib
@@ -2299,6 +2390,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
@@ -2413,6 +2505,9 @@ check-host:  \
     maybe-check-sim \
     maybe-check-texinfo \
     maybe-check-zlib \
+    maybe-check-gnulib \
+    maybe-check-gdbsupport \
+    maybe-check-gdbserver \
     maybe-check-gdb \
     maybe-check-expect \
     maybe-check-guile \
@@ -2422,15 +2517,14 @@ 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-libcilkrts \
     maybe-check-target-liboffloadmic \
     maybe-check-target-libssp \
     maybe-check-target-newlib \
@@ -2441,6 +2535,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 \
@@ -2546,6 +2641,9 @@ install-host-nogcc:  \
     maybe-install-sim \
     maybe-install-texinfo \
     maybe-install-zlib \
+    maybe-install-gnulib \
+    maybe-install-gdbsupport \
+    maybe-install-gdbserver \
     maybe-install-gdb \
     maybe-install-expect \
     maybe-install-guile \
@@ -2555,7 +2653,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:  \
@@ -2595,6 +2694,9 @@ install-host:  \
     maybe-install-sim \
     maybe-install-texinfo \
     maybe-install-zlib \
+    maybe-install-gnulib \
+    maybe-install-gdbsupport \
+    maybe-install-gdbserver \
     maybe-install-gdb \
     maybe-install-expect \
     maybe-install-guile \
@@ -2604,15 +2706,14 @@ 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-libcilkrts \
     maybe-install-target-liboffloadmic \
     maybe-install-target-libssp \
     maybe-install-target-newlib \
@@ -2623,6 +2724,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 \
@@ -2701,6 +2803,9 @@ install-strip-host:  \
     maybe-install-strip-sim \
     maybe-install-strip-texinfo \
     maybe-install-strip-zlib \
+    maybe-install-strip-gnulib \
+    maybe-install-strip-gdbsupport \
+    maybe-install-strip-gdbserver \
     maybe-install-strip-gdb \
     maybe-install-strip-expect \
     maybe-install-strip-guile \
@@ -2710,15 +2815,14 @@ 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-libcilkrts \
     maybe-install-strip-target-liboffloadmic \
     maybe-install-strip-target-libssp \
     maybe-install-strip-target-newlib \
@@ -2729,6 +2833,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 \
@@ -3556,6 +3661,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)" \
@@ -3600,6 +3706,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)" \
@@ -3642,6 +3749,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)" \
@@ -3684,6 +3792,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)" \
@@ -3726,6 +3835,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)" \
@@ -3768,6 +3878,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)" \
@@ -3810,6 +3921,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)" \
@@ -3852,6 +3964,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)" \
@@ -3894,6 +4007,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)" \
@@ -4661,6 +4775,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)" \
@@ -4705,6 +4820,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)" \
@@ -4747,6 +4863,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)" \
@@ -4789,6 +4906,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)" \
@@ -4831,6 +4949,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)" \
@@ -4873,6 +4992,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)" \
@@ -4915,6 +5035,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)" \
@@ -4957,6 +5078,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)" \
@@ -4999,6 +5121,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)" \
@@ -5766,6 +5889,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)" \
@@ -5810,6 +5934,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)" \
@@ -5852,6 +5977,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)" \
@@ -5894,6 +6020,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)" \
@@ -5936,6 +6063,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)" \
@@ -5978,6 +6106,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)" \
@@ -6020,6 +6149,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)" \
@@ -6062,6 +6192,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)" \
@@ -6104,6 +6235,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)" \
@@ -9082,6 +9214,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)" \
@@ -9126,6 +9259,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)" \
@@ -9168,6 +9302,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)" \
@@ -9210,6 +9345,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)" \
@@ -9252,6 +9388,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)" \
@@ -9294,6 +9431,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)" \
@@ -9336,6 +9474,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)" \
@@ -9378,6 +9517,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)" \
@@ -9420,6 +9560,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)" \
@@ -10616,6 +10757,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)" \
@@ -10660,6 +10802,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)" \
@@ -10702,6 +10845,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)" \
@@ -10744,6 +10888,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)" \
@@ -10786,6 +10931,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)" \
@@ -10828,6 +10974,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)" \
@@ -10870,6 +11017,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)" \
@@ -10912,6 +11060,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)" \
@@ -10954,6 +11103,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)" \
@@ -11721,6 +11871,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)" \
@@ -11765,6 +11916,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)" \
@@ -11807,6 +11959,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)" \
@@ -11849,6 +12002,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)" \
@@ -11891,6 +12045,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)" \
@@ -11933,6 +12088,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)" \
@@ -11975,6 +12131,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)" \
@@ -12017,6 +12174,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)" \
@@ -12059,6 +12217,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)" \
@@ -12835,6 +12994,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)" \
@@ -12879,6 +13039,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)" \
@@ -12921,6 +13082,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)" \
@@ -12963,6 +13125,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)" \
@@ -13005,6 +13168,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)" \
@@ -13047,6 +13211,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)" \
@@ -13089,6 +13254,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)" \
@@ -13131,6 +13297,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)" \
@@ -13173,6 +13340,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)" \
@@ -13937,6 +14105,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)" \
@@ -13981,6 +14150,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)" \
@@ -14023,6 +14193,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)" \
@@ -14065,6 +14236,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)" \
@@ -14107,6 +14279,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)" \
@@ -14149,6 +14322,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)" \
@@ -14191,6 +14365,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)" \
@@ -14233,6 +14408,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)" \
@@ -14275,6 +14451,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)" \
@@ -15039,6 +15216,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)" \
@@ -15083,6 +15261,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)" \
@@ -15125,6 +15304,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)" \
@@ -15167,6 +15347,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)" \
@@ -15209,6 +15390,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)" \
@@ -15251,6 +15433,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)" \
@@ -15293,6 +15476,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)" \
@@ -15335,6 +15519,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)" \
@@ -15377,6 +15562,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)" \
@@ -16141,6 +16327,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)" \
@@ -16185,6 +16372,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)" \
@@ -16227,6 +16415,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)" \
@@ -16269,6 +16458,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)" \
@@ -16311,6 +16501,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)" \
@@ -16353,6 +16544,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)" \
@@ -16395,6 +16587,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)" \
@@ -16437,6 +16630,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)" \
@@ -16479,6 +16673,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)" \
@@ -17243,6 +17438,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)" \
@@ -17287,6 +17483,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)" \
@@ -17329,6 +17526,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)" \
@@ -17371,6 +17569,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)" \
@@ -17413,6 +17612,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)" \
@@ -17455,6 +17655,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)" \
@@ -17497,6 +17698,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)" \
@@ -17539,6 +17741,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)" \
@@ -17581,6 +17784,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)" \
@@ -18336,6 +18540,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)" \
@@ -18380,6 +18585,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)" \
@@ -18422,6 +18628,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)" \
@@ -18464,6 +18671,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)" \
@@ -18506,6 +18714,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)" \
@@ -18548,6 +18757,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)" \
@@ -18590,6 +18800,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)" \
@@ -18632,6 +18843,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)" \
@@ -18674,6 +18886,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)" \
@@ -19882,6 +20095,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)" \
@@ -19926,6 +20140,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)" \
@@ -19968,6 +20183,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)" \
@@ -20010,6 +20226,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)" \
@@ -20052,6 +20269,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)" \
@@ -20094,6 +20312,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)" \
@@ -20136,6 +20355,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)" \
@@ -20178,6 +20398,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)" \
@@ -20220,6 +20441,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)" \
@@ -21854,6 +22076,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)" \
@@ -21898,6 +22121,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)" \
@@ -21940,6 +22164,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)" \
@@ -21982,6 +22207,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)" \
@@ -22024,6 +22250,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)" \
@@ -22066,6 +22293,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)" \
@@ -22108,6 +22336,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)" \
@@ -22150,6 +22379,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)" \
@@ -22192,6 +22422,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)" \
@@ -22959,6 +23190,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)" \
@@ -23003,6 +23235,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)" \
@@ -23045,6 +23278,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)" \
@@ -23087,6 +23321,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)" \
@@ -23129,6 +23364,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)" \
@@ -23171,6 +23407,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)" \
@@ -23213,6 +23450,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)" \
@@ -23255,6 +23493,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)" \
@@ -23297,6 +23536,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)" \
@@ -24064,6 +24304,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)" \
@@ -24108,6 +24349,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)" \
@@ -24150,6 +24392,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)" \
@@ -24192,6 +24435,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)" \
@@ -24234,6 +24478,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)" \
@@ -24276,6 +24521,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)" \
@@ -24318,6 +24564,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)" \
@@ -24360,6 +24607,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)" \
@@ -24402,6 +24650,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)" \
@@ -25169,6 +25418,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)" \
@@ -25213,6 +25463,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)" \
@@ -25255,6 +25506,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)" \
@@ -25297,6 +25549,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)" \
@@ -25339,6 +25592,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)" \
@@ -25381,6 +25635,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)" \
@@ -25423,6 +25678,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)" \
@@ -25465,6 +25721,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)" \
@@ -25507,6 +25764,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)" \
@@ -26724,6 +26982,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)" \
@@ -26768,6 +27027,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)" \
@@ -26810,6 +27070,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)" \
@@ -26852,6 +27113,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)" \
@@ -26894,6 +27156,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)" \
@@ -26936,6 +27199,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)" \
@@ -26978,6 +27242,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)" \
@@ -27020,6 +27285,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)" \
@@ -27062,6 +27328,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)" \
@@ -27838,6 +28105,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)" \
@@ -27882,6 +28150,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)" \
@@ -27924,6 +28193,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)" \
@@ -27966,6 +28236,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)" \
@@ -28008,6 +28279,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)" \
@@ -28050,6 +28322,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)" \
@@ -28092,6 +28365,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)" \
@@ -28134,6 +28408,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)" \
@@ -28176,6 +28451,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)" \
@@ -28952,6 +29228,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)" \
@@ -28996,6 +29273,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)" \
@@ -29038,6 +29316,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)" \
@@ -29080,6 +29359,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)" \
@@ -29122,6 +29402,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)" \
@@ -29164,6 +29445,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)" \
@@ -29206,6 +29488,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)" \
@@ -29248,6 +29531,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)" \
@@ -29290,6 +29574,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)" \
@@ -32154,6 +32439,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)" \
@@ -32198,6 +32484,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)" \
@@ -32240,6 +32527,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)" \
@@ -32282,6 +32570,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)" \
@@ -32324,6 +32613,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)" \
@@ -32366,6 +32656,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)" \
@@ -32408,6 +32699,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)" \
@@ -32450,6 +32742,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)" \
@@ -32492,6 +32785,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)" \
@@ -32873,125 +33167,125 @@ maintainer-clean-zlib:
 
 
 
-.PHONY: configure-gdb maybe-configure-gdb
-maybe-configure-gdb:
+.PHONY: configure-gnulib maybe-configure-gnulib
+maybe-configure-gnulib:
 @if gcc-bootstrap
-configure-gdb: stage_current
+configure-gnulib: stage_current
 @endif gcc-bootstrap
-@if gdb
-maybe-configure-gdb: configure-gdb
-configure-gdb: 
+@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)/gdb/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb; \
+       test ! -f $(HOST_SUBDIR)/gnulib/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnulib; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gdb; \
-       cd "$(HOST_SUBDIR)/gdb" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gnulib; \
+       cd "$(HOST_SUBDIR)/gnulib" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gnulib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=gdb; \
+       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 gdb
+@endif gnulib
 
 
 
 
 
-.PHONY: all-gdb maybe-all-gdb
-maybe-all-gdb:
+.PHONY: all-gnulib maybe-all-gnulib
+maybe-all-gnulib:
 @if gcc-bootstrap
-all-gdb: stage_current
+all-gnulib: stage_current
 @endif gcc-bootstrap
-@if gdb
-TARGET-gdb=all
-maybe-all-gdb: all-gdb
-all-gdb: configure-gdb
+@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)/gdb && \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-gdb))
-@endif gdb
+               $(TARGET-gnulib))
+@endif gnulib
 
 
 
 
-.PHONY: check-gdb maybe-check-gdb
-maybe-check-gdb:
-@if gdb
-maybe-check-gdb: check-gdb
+.PHONY: check-gnulib maybe-check-gnulib
+maybe-check-gnulib:
+@if gnulib
+maybe-check-gnulib: check-gnulib
 
-check-gdb:
+check-gnulib:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/gdb && \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif gdb
+@endif gnulib
 
-.PHONY: install-gdb maybe-install-gdb
-maybe-install-gdb:
-@if gdb
-maybe-install-gdb: install-gdb
+.PHONY: install-gnulib maybe-install-gnulib
+maybe-install-gnulib:
+@if gnulib
+maybe-install-gnulib: install-gnulib
 
-install-gdb: installdirs
+install-gnulib: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gdb && \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif gdb
+@endif gnulib
 
-.PHONY: install-strip-gdb maybe-install-strip-gdb
-maybe-install-strip-gdb:
-@if gdb
-maybe-install-strip-gdb: install-strip-gdb
+.PHONY: install-strip-gnulib maybe-install-strip-gnulib
+maybe-install-strip-gnulib:
+@if gnulib
+maybe-install-strip-gnulib: install-strip-gnulib
 
-install-strip-gdb: installdirs
+install-strip-gnulib: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gdb && \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif gdb
+@endif gnulib
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-gdb info-gdb
-maybe-info-gdb:
-@if gdb
-maybe-info-gdb: info-gdb
+.PHONY: maybe-info-gnulib info-gnulib
+maybe-info-gnulib:
+@if gnulib
+maybe-info-gnulib: info-gnulib
 
-info-gdb: \
-    configure-gdb 
+info-gnulib: \
+    configure-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -32999,25 +33293,25 @@ info-gdb: \
                  info) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
-.PHONY: maybe-dvi-gdb dvi-gdb
-maybe-dvi-gdb:
-@if gdb
-maybe-dvi-gdb: dvi-gdb
+.PHONY: maybe-dvi-gnulib dvi-gnulib
+maybe-dvi-gnulib:
+@if gnulib
+maybe-dvi-gnulib: dvi-gnulib
 
-dvi-gdb: \
-    configure-gdb 
+dvi-gnulib: \
+    configure-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -33025,25 +33319,25 @@ dvi-gdb: \
                  dvi) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
-.PHONY: maybe-pdf-gdb pdf-gdb
-maybe-pdf-gdb:
-@if gdb
-maybe-pdf-gdb: pdf-gdb
+.PHONY: maybe-pdf-gnulib pdf-gnulib
+maybe-pdf-gnulib:
+@if gnulib
+maybe-pdf-gnulib: pdf-gnulib
 
-pdf-gdb: \
-    configure-gdb 
+pdf-gnulib: \
+    configure-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -33051,25 +33345,25 @@ pdf-gdb: \
                  pdf) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
-.PHONY: maybe-html-gdb html-gdb
-maybe-html-gdb:
-@if gdb
-maybe-html-gdb: html-gdb
+.PHONY: maybe-html-gnulib html-gnulib
+maybe-html-gnulib:
+@if gnulib
+maybe-html-gnulib: html-gnulib
 
-html-gdb: \
-    configure-gdb 
+html-gnulib: \
+    configure-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -33077,25 +33371,25 @@ html-gdb: \
                  html) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
-.PHONY: maybe-TAGS-gdb TAGS-gdb
-maybe-TAGS-gdb:
-@if gdb
-maybe-TAGS-gdb: TAGS-gdb
+.PHONY: maybe-TAGS-gnulib TAGS-gnulib
+maybe-TAGS-gnulib:
+@if gnulib
+maybe-TAGS-gnulib: TAGS-gnulib
 
-TAGS-gdb: \
-    configure-gdb 
+TAGS-gnulib: \
+    configure-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -33103,26 +33397,26 @@ TAGS-gdb: \
                  TAGS) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
-.PHONY: maybe-install-info-gdb install-info-gdb
-maybe-install-info-gdb:
-@if gdb
-maybe-install-info-gdb: install-info-gdb
+.PHONY: maybe-install-info-gnulib install-info-gnulib
+maybe-install-info-gnulib:
+@if gnulib
+maybe-install-info-gnulib: install-info-gnulib
 
-install-info-gdb: \
-    configure-gdb \
-    info-gdb 
+install-info-gnulib: \
+    configure-gnulib \
+    info-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -33130,26 +33424,26 @@ install-info-gdb: \
                  install-info) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
-.PHONY: maybe-install-pdf-gdb install-pdf-gdb
-maybe-install-pdf-gdb:
-@if gdb
-maybe-install-pdf-gdb: install-pdf-gdb
+.PHONY: maybe-install-pdf-gnulib install-pdf-gnulib
+maybe-install-pdf-gnulib:
+@if gnulib
+maybe-install-pdf-gnulib: install-pdf-gnulib
 
-install-pdf-gdb: \
-    configure-gdb \
-    pdf-gdb 
+install-pdf-gnulib: \
+    configure-gnulib \
+    pdf-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -33157,26 +33451,26 @@ install-pdf-gdb: \
                  install-pdf) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
-.PHONY: maybe-install-html-gdb install-html-gdb
-maybe-install-html-gdb:
-@if gdb
-maybe-install-html-gdb: install-html-gdb
+.PHONY: maybe-install-html-gnulib install-html-gnulib
+maybe-install-html-gnulib:
+@if gnulib
+maybe-install-html-gnulib: install-html-gnulib
 
-install-html-gdb: \
-    configure-gdb \
-    html-gdb 
+install-html-gnulib: \
+    configure-gnulib \
+    html-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -33184,25 +33478,25 @@ install-html-gdb: \
                  install-html) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
-.PHONY: maybe-installcheck-gdb installcheck-gdb
-maybe-installcheck-gdb:
-@if gdb
-maybe-installcheck-gdb: installcheck-gdb
+.PHONY: maybe-installcheck-gnulib installcheck-gnulib
+maybe-installcheck-gnulib:
+@if gnulib
+maybe-installcheck-gnulib: installcheck-gnulib
 
-installcheck-gdb: \
-    configure-gdb 
+installcheck-gnulib: \
+    configure-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -33210,24 +33504,24 @@ installcheck-gdb: \
                  installcheck) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
-.PHONY: maybe-mostlyclean-gdb mostlyclean-gdb
-maybe-mostlyclean-gdb:
-@if gdb
-maybe-mostlyclean-gdb: mostlyclean-gdb
+.PHONY: maybe-mostlyclean-gnulib mostlyclean-gnulib
+maybe-mostlyclean-gnulib:
+@if gnulib
+maybe-mostlyclean-gnulib: mostlyclean-gnulib
 
-mostlyclean-gdb: 
+mostlyclean-gnulib: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -33235,24 +33529,24 @@ mostlyclean-gdb:
                  mostlyclean) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
-.PHONY: maybe-clean-gdb clean-gdb
-maybe-clean-gdb:
-@if gdb
-maybe-clean-gdb: clean-gdb
+.PHONY: maybe-clean-gnulib clean-gnulib
+maybe-clean-gnulib:
+@if gnulib
+maybe-clean-gnulib: clean-gnulib
 
-clean-gdb: 
+clean-gnulib: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -33260,24 +33554,24 @@ clean-gdb:
                  clean) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
-.PHONY: maybe-distclean-gdb distclean-gdb
-maybe-distclean-gdb:
-@if gdb
-maybe-distclean-gdb: distclean-gdb
+.PHONY: maybe-distclean-gnulib distclean-gnulib
+maybe-distclean-gnulib:
+@if gnulib
+maybe-distclean-gnulib: distclean-gnulib
 
-distclean-gdb: 
+distclean-gnulib: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -33285,24 +33579,24 @@ distclean-gdb:
                  distclean) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
-.PHONY: maybe-maintainer-clean-gdb maintainer-clean-gdb
-maybe-maintainer-clean-gdb:
-@if gdb
-maybe-maintainer-clean-gdb: maintainer-clean-gdb
+.PHONY: maybe-maintainer-clean-gnulib maintainer-clean-gnulib
+maybe-maintainer-clean-gnulib:
+@if gnulib
+maybe-maintainer-clean-gnulib: maintainer-clean-gnulib
 
-maintainer-clean-gdb: 
+maintainer-clean-gnulib: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -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 gdb"; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -33310,129 +33604,129 @@ maintainer-clean-gdb:
                  maintainer-clean) \
          || exit 1
 
-@endif gdb
+@endif gnulib
 
 
 
-.PHONY: configure-expect maybe-configure-expect
-maybe-configure-expect:
+.PHONY: configure-gdbsupport maybe-configure-gdbsupport
+maybe-configure-gdbsupport:
 @if gcc-bootstrap
-configure-expect: stage_current
+configure-gdbsupport: stage_current
 @endif gcc-bootstrap
-@if expect
-maybe-configure-expect: configure-expect
-configure-expect: 
+@if gdbsupport
+maybe-configure-gdbsupport: configure-gdbsupport
+configure-gdbsupport: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect; \
+       test ! -f $(HOST_SUBDIR)/gdbsupport/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdbsupport; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/expect; \
-       cd "$(HOST_SUBDIR)/expect" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gdbsupport; \
+       cd "$(HOST_SUBDIR)/gdbsupport" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gdbsupport/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=expect; \
+       module_srcdir=gdbsupport; \
        $(SHELL) \
          $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif expect
+@endif gdbsupport
 
 
 
 
 
-.PHONY: all-expect maybe-all-expect
-maybe-all-expect:
+.PHONY: all-gdbsupport maybe-all-gdbsupport
+maybe-all-gdbsupport:
 @if gcc-bootstrap
-all-expect: stage_current
+all-gdbsupport: stage_current
 @endif gcc-bootstrap
-@if expect
-TARGET-expect=all
-maybe-all-expect: all-expect
-all-expect: configure-expect
+@if gdbsupport
+TARGET-gdbsupport=all
+maybe-all-gdbsupport: all-gdbsupport
+all-gdbsupport: configure-gdbsupport
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/expect && \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-expect))
-@endif expect
+               $(TARGET-gdbsupport))
+@endif gdbsupport
 
 
 
 
-.PHONY: check-expect maybe-check-expect
-maybe-check-expect:
-@if expect
-maybe-check-expect: check-expect
+.PHONY: check-gdbsupport maybe-check-gdbsupport
+maybe-check-gdbsupport:
+@if gdbsupport
+maybe-check-gdbsupport: check-gdbsupport
 
-check-expect:
+check-gdbsupport:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/expect && \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: install-expect maybe-install-expect
-maybe-install-expect:
-@if expect
-maybe-install-expect: install-expect
+.PHONY: install-gdbsupport maybe-install-gdbsupport
+maybe-install-gdbsupport:
+@if gdbsupport
+maybe-install-gdbsupport: install-gdbsupport
 
-install-expect: installdirs
+install-gdbsupport: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/expect && \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: install-strip-expect maybe-install-strip-expect
-maybe-install-strip-expect:
-@if expect
-maybe-install-strip-expect: install-strip-expect
+.PHONY: install-strip-gdbsupport maybe-install-strip-gdbsupport
+maybe-install-strip-gdbsupport:
+@if gdbsupport
+maybe-install-strip-gdbsupport: install-strip-gdbsupport
 
-install-strip-expect: installdirs
+install-strip-gdbsupport: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/expect && \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif expect
+@endif gdbsupport
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-expect info-expect
-maybe-info-expect:
-@if expect
-maybe-info-expect: info-expect
+.PHONY: maybe-info-gdbsupport info-gdbsupport
+maybe-info-gdbsupport:
+@if gdbsupport
+maybe-info-gdbsupport: info-gdbsupport
 
-info-expect: \
-    configure-expect 
+info-gdbsupport: \
+    configure-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing info in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33440,25 +33734,25 @@ info-expect: \
                  info) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: maybe-dvi-expect dvi-expect
-maybe-dvi-expect:
-@if expect
-maybe-dvi-expect: dvi-expect
+.PHONY: maybe-dvi-gdbsupport dvi-gdbsupport
+maybe-dvi-gdbsupport:
+@if gdbsupport
+maybe-dvi-gdbsupport: dvi-gdbsupport
 
-dvi-expect: \
-    configure-expect 
+dvi-gdbsupport: \
+    configure-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing dvi in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33466,25 +33760,25 @@ dvi-expect: \
                  dvi) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: maybe-pdf-expect pdf-expect
-maybe-pdf-expect:
-@if expect
-maybe-pdf-expect: pdf-expect
+.PHONY: maybe-pdf-gdbsupport pdf-gdbsupport
+maybe-pdf-gdbsupport:
+@if gdbsupport
+maybe-pdf-gdbsupport: pdf-gdbsupport
 
-pdf-expect: \
-    configure-expect 
+pdf-gdbsupport: \
+    configure-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing pdf in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33492,25 +33786,25 @@ pdf-expect: \
                  pdf) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: maybe-html-expect html-expect
-maybe-html-expect:
-@if expect
-maybe-html-expect: html-expect
+.PHONY: maybe-html-gdbsupport html-gdbsupport
+maybe-html-gdbsupport:
+@if gdbsupport
+maybe-html-gdbsupport: html-gdbsupport
 
-html-expect: \
-    configure-expect 
+html-gdbsupport: \
+    configure-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing html in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33518,25 +33812,25 @@ html-expect: \
                  html) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: maybe-TAGS-expect TAGS-expect
-maybe-TAGS-expect:
-@if expect
-maybe-TAGS-expect: TAGS-expect
+.PHONY: maybe-TAGS-gdbsupport TAGS-gdbsupport
+maybe-TAGS-gdbsupport:
+@if gdbsupport
+maybe-TAGS-gdbsupport: TAGS-gdbsupport
 
-TAGS-expect: \
-    configure-expect 
+TAGS-gdbsupport: \
+    configure-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing TAGS in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33544,26 +33838,26 @@ TAGS-expect: \
                  TAGS) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: maybe-install-info-expect install-info-expect
-maybe-install-info-expect:
-@if expect
-maybe-install-info-expect: install-info-expect
+.PHONY: maybe-install-info-gdbsupport install-info-gdbsupport
+maybe-install-info-gdbsupport:
+@if gdbsupport
+maybe-install-info-gdbsupport: install-info-gdbsupport
 
-install-info-expect: \
-    configure-expect \
-    info-expect 
+install-info-gdbsupport: \
+    configure-gdbsupport \
+    info-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing install-info in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33571,26 +33865,26 @@ install-info-expect: \
                  install-info) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: maybe-install-pdf-expect install-pdf-expect
-maybe-install-pdf-expect:
-@if expect
-maybe-install-pdf-expect: install-pdf-expect
+.PHONY: maybe-install-pdf-gdbsupport install-pdf-gdbsupport
+maybe-install-pdf-gdbsupport:
+@if gdbsupport
+maybe-install-pdf-gdbsupport: install-pdf-gdbsupport
 
-install-pdf-expect: \
-    configure-expect \
-    pdf-expect 
+install-pdf-gdbsupport: \
+    configure-gdbsupport \
+    pdf-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing install-pdf in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33598,26 +33892,26 @@ install-pdf-expect: \
                  install-pdf) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: maybe-install-html-expect install-html-expect
-maybe-install-html-expect:
-@if expect
-maybe-install-html-expect: install-html-expect
+.PHONY: maybe-install-html-gdbsupport install-html-gdbsupport
+maybe-install-html-gdbsupport:
+@if gdbsupport
+maybe-install-html-gdbsupport: install-html-gdbsupport
 
-install-html-expect: \
-    configure-expect \
-    html-expect 
+install-html-gdbsupport: \
+    configure-gdbsupport \
+    html-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing install-html in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33625,25 +33919,25 @@ install-html-expect: \
                  install-html) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: maybe-installcheck-expect installcheck-expect
-maybe-installcheck-expect:
-@if expect
-maybe-installcheck-expect: installcheck-expect
+.PHONY: maybe-installcheck-gdbsupport installcheck-gdbsupport
+maybe-installcheck-gdbsupport:
+@if gdbsupport
+maybe-installcheck-gdbsupport: installcheck-gdbsupport
 
-installcheck-expect: \
-    configure-expect 
+installcheck-gdbsupport: \
+    configure-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing installcheck in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33651,24 +33945,24 @@ installcheck-expect: \
                  installcheck) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: maybe-mostlyclean-expect mostlyclean-expect
-maybe-mostlyclean-expect:
-@if expect
-maybe-mostlyclean-expect: mostlyclean-expect
+.PHONY: maybe-mostlyclean-gdbsupport mostlyclean-gdbsupport
+maybe-mostlyclean-gdbsupport:
+@if gdbsupport
+maybe-mostlyclean-gdbsupport: mostlyclean-gdbsupport
 
-mostlyclean-expect: 
+mostlyclean-gdbsupport: 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing mostlyclean in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33676,24 +33970,24 @@ mostlyclean-expect:
                  mostlyclean) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: maybe-clean-expect clean-expect
-maybe-clean-expect:
-@if expect
-maybe-clean-expect: clean-expect
+.PHONY: maybe-clean-gdbsupport clean-gdbsupport
+maybe-clean-gdbsupport:
+@if gdbsupport
+maybe-clean-gdbsupport: clean-gdbsupport
 
-clean-expect: 
+clean-gdbsupport: 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing clean in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33701,24 +33995,24 @@ clean-expect:
                  clean) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: maybe-distclean-expect distclean-expect
-maybe-distclean-expect:
-@if expect
-maybe-distclean-expect: distclean-expect
+.PHONY: maybe-distclean-gdbsupport distclean-gdbsupport
+maybe-distclean-gdbsupport:
+@if gdbsupport
+maybe-distclean-gdbsupport: distclean-gdbsupport
 
-distclean-expect: 
+distclean-gdbsupport: 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing distclean in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33726,24 +34020,24 @@ distclean-expect:
                  distclean) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
-.PHONY: maybe-maintainer-clean-expect maintainer-clean-expect
-maybe-maintainer-clean-expect:
-@if expect
-maybe-maintainer-clean-expect: maintainer-clean-expect
+.PHONY: maybe-maintainer-clean-gdbsupport maintainer-clean-gdbsupport
+maybe-maintainer-clean-gdbsupport:
+@if gdbsupport
+maybe-maintainer-clean-gdbsupport: maintainer-clean-gdbsupport
 
-maintainer-clean-expect: 
+maintainer-clean-gdbsupport: 
        @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/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 expect"; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing maintainer-clean in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33751,129 +34045,129 @@ maintainer-clean-expect:
                  maintainer-clean) \
          || exit 1
 
-@endif expect
+@endif gdbsupport
 
 
 
-.PHONY: configure-guile maybe-configure-guile
-maybe-configure-guile:
+.PHONY: configure-gdbserver maybe-configure-gdbserver
+maybe-configure-gdbserver:
 @if gcc-bootstrap
-configure-guile: stage_current
+configure-gdbserver: stage_current
 @endif gcc-bootstrap
-@if guile
-maybe-configure-guile: configure-guile
-configure-guile: 
+@if gdbserver
+maybe-configure-gdbserver: configure-gdbserver
+configure-gdbserver: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile; \
+       test ! -f $(HOST_SUBDIR)/gdbserver/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdbserver; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/guile; \
-       cd "$(HOST_SUBDIR)/guile" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gdbserver; \
+       cd "$(HOST_SUBDIR)/gdbserver" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gdbserver/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=guile; \
+       module_srcdir=gdbserver; \
        $(SHELL) \
          $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif guile
+@endif gdbserver
 
 
 
 
 
-.PHONY: all-guile maybe-all-guile
-maybe-all-guile:
+.PHONY: all-gdbserver maybe-all-gdbserver
+maybe-all-gdbserver:
 @if gcc-bootstrap
-all-guile: stage_current
+all-gdbserver: stage_current
 @endif gcc-bootstrap
-@if guile
-TARGET-guile=all
-maybe-all-guile: all-guile
-all-guile: configure-guile
+@if gdbserver
+TARGET-gdbserver=all
+maybe-all-gdbserver: all-gdbserver
+all-gdbserver: configure-gdbserver
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-guile))
-@endif guile
+               $(TARGET-gdbserver))
+@endif gdbserver
 
 
 
 
-.PHONY: check-guile maybe-check-guile
-maybe-check-guile:
-@if guile
-maybe-check-guile: check-guile
+.PHONY: check-gdbserver maybe-check-gdbserver
+maybe-check-gdbserver:
+@if gdbserver
+maybe-check-gdbserver: check-gdbserver
 
-check-guile:
+check-gdbserver:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif guile
+@endif gdbserver
 
-.PHONY: install-guile maybe-install-guile
-maybe-install-guile:
-@if guile
-maybe-install-guile: install-guile
+.PHONY: install-gdbserver maybe-install-gdbserver
+maybe-install-gdbserver:
+@if gdbserver
+maybe-install-gdbserver: install-gdbserver
 
-install-guile: installdirs
+install-gdbserver: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif guile
+@endif gdbserver
 
-.PHONY: install-strip-guile maybe-install-strip-guile
-maybe-install-strip-guile:
-@if guile
-maybe-install-strip-guile: install-strip-guile
+.PHONY: install-strip-gdbserver maybe-install-strip-gdbserver
+maybe-install-strip-gdbserver:
+@if gdbserver
+maybe-install-strip-gdbserver: install-strip-gdbserver
 
-install-strip-guile: installdirs
+install-strip-gdbserver: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif guile
+@endif gdbserver
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-guile info-guile
-maybe-info-guile:
-@if guile
-maybe-info-guile: info-guile
+.PHONY: maybe-info-gdbserver info-gdbserver
+maybe-info-gdbserver:
+@if gdbserver
+maybe-info-gdbserver: info-gdbserver
 
-info-guile: \
-    configure-guile 
+info-gdbserver: \
+    configure-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing info in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33881,25 +34175,25 @@ info-guile: \
                  info) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
-.PHONY: maybe-dvi-guile dvi-guile
-maybe-dvi-guile:
-@if guile
-maybe-dvi-guile: dvi-guile
+.PHONY: maybe-dvi-gdbserver dvi-gdbserver
+maybe-dvi-gdbserver:
+@if gdbserver
+maybe-dvi-gdbserver: dvi-gdbserver
 
-dvi-guile: \
-    configure-guile 
+dvi-gdbserver: \
+    configure-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing dvi in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33907,25 +34201,25 @@ dvi-guile: \
                  dvi) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
-.PHONY: maybe-pdf-guile pdf-guile
-maybe-pdf-guile:
-@if guile
-maybe-pdf-guile: pdf-guile
+.PHONY: maybe-pdf-gdbserver pdf-gdbserver
+maybe-pdf-gdbserver:
+@if gdbserver
+maybe-pdf-gdbserver: pdf-gdbserver
 
-pdf-guile: \
-    configure-guile 
+pdf-gdbserver: \
+    configure-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing pdf in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33933,25 +34227,25 @@ pdf-guile: \
                  pdf) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
-.PHONY: maybe-html-guile html-guile
-maybe-html-guile:
-@if guile
-maybe-html-guile: html-guile
+.PHONY: maybe-html-gdbserver html-gdbserver
+maybe-html-gdbserver:
+@if gdbserver
+maybe-html-gdbserver: html-gdbserver
 
-html-guile: \
-    configure-guile 
+html-gdbserver: \
+    configure-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing html in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33959,25 +34253,25 @@ html-guile: \
                  html) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
-.PHONY: maybe-TAGS-guile TAGS-guile
-maybe-TAGS-guile:
-@if guile
-maybe-TAGS-guile: TAGS-guile
+.PHONY: maybe-TAGS-gdbserver TAGS-gdbserver
+maybe-TAGS-gdbserver:
+@if gdbserver
+maybe-TAGS-gdbserver: TAGS-gdbserver
 
-TAGS-guile: \
-    configure-guile 
+TAGS-gdbserver: \
+    configure-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing TAGS in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33985,26 +34279,26 @@ TAGS-guile: \
                  TAGS) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
-.PHONY: maybe-install-info-guile install-info-guile
-maybe-install-info-guile:
-@if guile
-maybe-install-info-guile: install-info-guile
+.PHONY: maybe-install-info-gdbserver install-info-gdbserver
+maybe-install-info-gdbserver:
+@if gdbserver
+maybe-install-info-gdbserver: install-info-gdbserver
 
-install-info-guile: \
-    configure-guile \
-    info-guile 
+install-info-gdbserver: \
+    configure-gdbserver \
+    info-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing install-info in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34012,26 +34306,26 @@ install-info-guile: \
                  install-info) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
-.PHONY: maybe-install-pdf-guile install-pdf-guile
-maybe-install-pdf-guile:
-@if guile
-maybe-install-pdf-guile: install-pdf-guile
+.PHONY: maybe-install-pdf-gdbserver install-pdf-gdbserver
+maybe-install-pdf-gdbserver:
+@if gdbserver
+maybe-install-pdf-gdbserver: install-pdf-gdbserver
 
-install-pdf-guile: \
-    configure-guile \
-    pdf-guile 
+install-pdf-gdbserver: \
+    configure-gdbserver \
+    pdf-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing install-pdf in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34039,26 +34333,26 @@ install-pdf-guile: \
                  install-pdf) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
-.PHONY: maybe-install-html-guile install-html-guile
-maybe-install-html-guile:
-@if guile
-maybe-install-html-guile: install-html-guile
+.PHONY: maybe-install-html-gdbserver install-html-gdbserver
+maybe-install-html-gdbserver:
+@if gdbserver
+maybe-install-html-gdbserver: install-html-gdbserver
 
-install-html-guile: \
-    configure-guile \
-    html-guile 
+install-html-gdbserver: \
+    configure-gdbserver \
+    html-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing install-html in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34066,25 +34360,25 @@ install-html-guile: \
                  install-html) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
-.PHONY: maybe-installcheck-guile installcheck-guile
-maybe-installcheck-guile:
-@if guile
-maybe-installcheck-guile: installcheck-guile
+.PHONY: maybe-installcheck-gdbserver installcheck-gdbserver
+maybe-installcheck-gdbserver:
+@if gdbserver
+maybe-installcheck-gdbserver: installcheck-gdbserver
 
-installcheck-guile: \
-    configure-guile 
+installcheck-gdbserver: \
+    configure-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing installcheck in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34092,24 +34386,24 @@ installcheck-guile: \
                  installcheck) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
-.PHONY: maybe-mostlyclean-guile mostlyclean-guile
-maybe-mostlyclean-guile:
-@if guile
-maybe-mostlyclean-guile: mostlyclean-guile
+.PHONY: maybe-mostlyclean-gdbserver mostlyclean-gdbserver
+maybe-mostlyclean-gdbserver:
+@if gdbserver
+maybe-mostlyclean-gdbserver: mostlyclean-gdbserver
 
-mostlyclean-guile: 
+mostlyclean-gdbserver: 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing mostlyclean in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34117,24 +34411,24 @@ mostlyclean-guile:
                  mostlyclean) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
-.PHONY: maybe-clean-guile clean-guile
-maybe-clean-guile:
-@if guile
-maybe-clean-guile: clean-guile
+.PHONY: maybe-clean-gdbserver clean-gdbserver
+maybe-clean-gdbserver:
+@if gdbserver
+maybe-clean-gdbserver: clean-gdbserver
 
-clean-guile: 
+clean-gdbserver: 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing clean in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34142,24 +34436,24 @@ clean-guile:
                  clean) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
-.PHONY: maybe-distclean-guile distclean-guile
-maybe-distclean-guile:
-@if guile
-maybe-distclean-guile: distclean-guile
+.PHONY: maybe-distclean-gdbserver distclean-gdbserver
+maybe-distclean-gdbserver:
+@if gdbserver
+maybe-distclean-gdbserver: distclean-gdbserver
 
-distclean-guile: 
+distclean-gdbserver: 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing distclean in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34167,24 +34461,24 @@ distclean-guile:
                  distclean) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
-.PHONY: maybe-maintainer-clean-guile maintainer-clean-guile
-maybe-maintainer-clean-guile:
-@if guile
-maybe-maintainer-clean-guile: maintainer-clean-guile
+.PHONY: maybe-maintainer-clean-gdbserver maintainer-clean-gdbserver
+maybe-maintainer-clean-gdbserver:
+@if gdbserver
+maybe-maintainer-clean-gdbserver: maintainer-clean-gdbserver
 
-maintainer-clean-guile: 
+maintainer-clean-gdbserver: 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/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 guile"; \
-       (cd $(HOST_SUBDIR)/guile && \
+       echo "Doing maintainer-clean in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34192,129 +34486,129 @@ maintainer-clean-guile:
                  maintainer-clean) \
          || exit 1
 
-@endif guile
+@endif gdbserver
 
 
 
-.PHONY: configure-tk maybe-configure-tk
-maybe-configure-tk:
+.PHONY: configure-gdb maybe-configure-gdb
+maybe-configure-gdb:
 @if gcc-bootstrap
-configure-tk: stage_current
+configure-gdb: stage_current
 @endif gcc-bootstrap
-@if tk
-maybe-configure-tk: configure-tk
-configure-tk: 
+@if gdb
+maybe-configure-gdb: configure-gdb
+configure-gdb: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk; \
+       test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/tk; \
-       cd "$(HOST_SUBDIR)/tk" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gdb; \
+       cd "$(HOST_SUBDIR)/gdb" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=tk; \
+       module_srcdir=gdb; \
        $(SHELL) \
          $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif tk
+@endif gdb
 
 
 
 
 
-.PHONY: all-tk maybe-all-tk
-maybe-all-tk:
+.PHONY: all-gdb maybe-all-gdb
+maybe-all-gdb:
 @if gcc-bootstrap
-all-tk: stage_current
+all-gdb: stage_current
 @endif gcc-bootstrap
-@if tk
-TARGET-tk=all
-maybe-all-tk: all-tk
-all-tk: configure-tk
+@if gdb
+TARGET-gdb=all
+maybe-all-gdb: all-gdb
+all-gdb: configure-gdb
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/tk && \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-tk))
-@endif tk
+               $(TARGET-gdb))
+@endif gdb
 
 
 
 
-.PHONY: check-tk maybe-check-tk
-maybe-check-tk:
-@if tk
-maybe-check-tk: check-tk
+.PHONY: check-gdb maybe-check-gdb
+maybe-check-gdb:
+@if gdb
+maybe-check-gdb: check-gdb
 
-check-tk:
+check-gdb:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/tk && \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif tk
+@endif gdb
 
-.PHONY: install-tk maybe-install-tk
-maybe-install-tk:
-@if tk
-maybe-install-tk: install-tk
+.PHONY: install-gdb maybe-install-gdb
+maybe-install-gdb:
+@if gdb
+maybe-install-gdb: install-gdb
 
-install-tk: installdirs
+install-gdb: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tk && \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif tk
+@endif gdb
 
-.PHONY: install-strip-tk maybe-install-strip-tk
-maybe-install-strip-tk:
-@if tk
-maybe-install-strip-tk: install-strip-tk
+.PHONY: install-strip-gdb maybe-install-strip-gdb
+maybe-install-strip-gdb:
+@if gdb
+maybe-install-strip-gdb: install-strip-gdb
 
-install-strip-tk: installdirs
+install-strip-gdb: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tk && \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif tk
+@endif gdb
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-tk info-tk
-maybe-info-tk:
-@if tk
-maybe-info-tk: info-tk
+.PHONY: maybe-info-gdb info-gdb
+maybe-info-gdb:
+@if gdb
+maybe-info-gdb: info-gdb
 
-info-tk: \
-    configure-tk 
+info-gdb: \
+    configure-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing info in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34322,25 +34616,25 @@ info-tk: \
                  info) \
          || exit 1
 
-@endif tk
+@endif gdb
 
-.PHONY: maybe-dvi-tk dvi-tk
-maybe-dvi-tk:
-@if tk
-maybe-dvi-tk: dvi-tk
+.PHONY: maybe-dvi-gdb dvi-gdb
+maybe-dvi-gdb:
+@if gdb
+maybe-dvi-gdb: dvi-gdb
 
-dvi-tk: \
-    configure-tk 
+dvi-gdb: \
+    configure-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing dvi in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34348,25 +34642,25 @@ dvi-tk: \
                  dvi) \
          || exit 1
 
-@endif tk
+@endif gdb
 
-.PHONY: maybe-pdf-tk pdf-tk
-maybe-pdf-tk:
-@if tk
-maybe-pdf-tk: pdf-tk
+.PHONY: maybe-pdf-gdb pdf-gdb
+maybe-pdf-gdb:
+@if gdb
+maybe-pdf-gdb: pdf-gdb
 
-pdf-tk: \
-    configure-tk 
+pdf-gdb: \
+    configure-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing pdf in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34374,25 +34668,25 @@ pdf-tk: \
                  pdf) \
          || exit 1
 
-@endif tk
+@endif gdb
 
-.PHONY: maybe-html-tk html-tk
-maybe-html-tk:
-@if tk
-maybe-html-tk: html-tk
+.PHONY: maybe-html-gdb html-gdb
+maybe-html-gdb:
+@if gdb
+maybe-html-gdb: html-gdb
 
-html-tk: \
-    configure-tk 
+html-gdb: \
+    configure-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing html in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34400,25 +34694,25 @@ html-tk: \
                  html) \
          || exit 1
 
-@endif tk
+@endif gdb
 
-.PHONY: maybe-TAGS-tk TAGS-tk
-maybe-TAGS-tk:
-@if tk
-maybe-TAGS-tk: TAGS-tk
+.PHONY: maybe-TAGS-gdb TAGS-gdb
+maybe-TAGS-gdb:
+@if gdb
+maybe-TAGS-gdb: TAGS-gdb
 
-TAGS-tk: \
-    configure-tk 
+TAGS-gdb: \
+    configure-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing TAGS in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34426,26 +34720,26 @@ TAGS-tk: \
                  TAGS) \
          || exit 1
 
-@endif tk
+@endif gdb
 
-.PHONY: maybe-install-info-tk install-info-tk
-maybe-install-info-tk:
-@if tk
-maybe-install-info-tk: install-info-tk
+.PHONY: maybe-install-info-gdb install-info-gdb
+maybe-install-info-gdb:
+@if gdb
+maybe-install-info-gdb: install-info-gdb
 
-install-info-tk: \
-    configure-tk \
-    info-tk 
+install-info-gdb: \
+    configure-gdb \
+    info-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing install-info in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34453,26 +34747,26 @@ install-info-tk: \
                  install-info) \
          || exit 1
 
-@endif tk
+@endif gdb
 
-.PHONY: maybe-install-pdf-tk install-pdf-tk
-maybe-install-pdf-tk:
-@if tk
-maybe-install-pdf-tk: install-pdf-tk
+.PHONY: maybe-install-pdf-gdb install-pdf-gdb
+maybe-install-pdf-gdb:
+@if gdb
+maybe-install-pdf-gdb: install-pdf-gdb
 
-install-pdf-tk: \
-    configure-tk \
-    pdf-tk 
+install-pdf-gdb: \
+    configure-gdb \
+    pdf-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing install-pdf in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34480,26 +34774,26 @@ install-pdf-tk: \
                  install-pdf) \
          || exit 1
 
-@endif tk
+@endif gdb
 
-.PHONY: maybe-install-html-tk install-html-tk
-maybe-install-html-tk:
-@if tk
-maybe-install-html-tk: install-html-tk
+.PHONY: maybe-install-html-gdb install-html-gdb
+maybe-install-html-gdb:
+@if gdb
+maybe-install-html-gdb: install-html-gdb
 
-install-html-tk: \
-    configure-tk \
-    html-tk 
+install-html-gdb: \
+    configure-gdb \
+    html-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing install-html in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34507,25 +34801,25 @@ install-html-tk: \
                  install-html) \
          || exit 1
 
-@endif tk
+@endif gdb
 
-.PHONY: maybe-installcheck-tk installcheck-tk
-maybe-installcheck-tk:
-@if tk
-maybe-installcheck-tk: installcheck-tk
+.PHONY: maybe-installcheck-gdb installcheck-gdb
+maybe-installcheck-gdb:
+@if gdb
+maybe-installcheck-gdb: installcheck-gdb
 
-installcheck-tk: \
-    configure-tk 
+installcheck-gdb: \
+    configure-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing installcheck in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34533,24 +34827,24 @@ installcheck-tk: \
                  installcheck) \
          || exit 1
 
-@endif tk
+@endif gdb
 
-.PHONY: maybe-mostlyclean-tk mostlyclean-tk
-maybe-mostlyclean-tk:
-@if tk
-maybe-mostlyclean-tk: mostlyclean-tk
+.PHONY: maybe-mostlyclean-gdb mostlyclean-gdb
+maybe-mostlyclean-gdb:
+@if gdb
+maybe-mostlyclean-gdb: mostlyclean-gdb
 
-mostlyclean-tk: 
+mostlyclean-gdb: 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing mostlyclean in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34558,24 +34852,24 @@ mostlyclean-tk:
                  mostlyclean) \
          || exit 1
 
-@endif tk
+@endif gdb
 
-.PHONY: maybe-clean-tk clean-tk
-maybe-clean-tk:
-@if tk
-maybe-clean-tk: clean-tk
+.PHONY: maybe-clean-gdb clean-gdb
+maybe-clean-gdb:
+@if gdb
+maybe-clean-gdb: clean-gdb
 
-clean-tk: 
+clean-gdb: 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing clean in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34583,24 +34877,24 @@ clean-tk:
                  clean) \
          || exit 1
 
-@endif tk
+@endif gdb
 
-.PHONY: maybe-distclean-tk distclean-tk
-maybe-distclean-tk:
-@if tk
-maybe-distclean-tk: distclean-tk
+.PHONY: maybe-distclean-gdb distclean-gdb
+maybe-distclean-gdb:
+@if gdb
+maybe-distclean-gdb: distclean-gdb
 
-distclean-tk: 
+distclean-gdb: 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing distclean in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34608,24 +34902,24 @@ distclean-tk:
                  distclean) \
          || exit 1
 
-@endif tk
+@endif gdb
 
-.PHONY: maybe-maintainer-clean-tk maintainer-clean-tk
-maybe-maintainer-clean-tk:
-@if tk
-maybe-maintainer-clean-tk: maintainer-clean-tk
+.PHONY: maybe-maintainer-clean-gdb maintainer-clean-gdb
+maybe-maintainer-clean-gdb:
+@if gdb
+maybe-maintainer-clean-gdb: maintainer-clean-gdb
 
-maintainer-clean-tk: 
+maintainer-clean-gdb: 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f ./gdb/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 tk"; \
-       (cd $(HOST_SUBDIR)/tk && \
+       echo "Doing maintainer-clean in gdb"; \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34633,123 +34927,129 @@ maintainer-clean-tk:
                  maintainer-clean) \
          || exit 1
 
-@endif tk
+@endif gdb
 
 
 
-.PHONY: configure-libtermcap maybe-configure-libtermcap
-maybe-configure-libtermcap:
+.PHONY: configure-expect maybe-configure-expect
+maybe-configure-expect:
 @if gcc-bootstrap
-configure-libtermcap: stage_current
+configure-expect: stage_current
 @endif gcc-bootstrap
-@if libtermcap
-maybe-configure-libtermcap: configure-libtermcap
-configure-libtermcap: 
+@if expect
+maybe-configure-expect: configure-expect
+configure-expect: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap; \
+       test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libtermcap; \
-       cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/expect; \
+       cd "$(HOST_SUBDIR)/expect" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libtermcap; \
+       module_srcdir=expect; \
        $(SHELL) \
          $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif libtermcap
+@endif expect
 
 
 
 
 
-.PHONY: all-libtermcap maybe-all-libtermcap
-maybe-all-libtermcap:
+.PHONY: all-expect maybe-all-expect
+maybe-all-expect:
 @if gcc-bootstrap
-all-libtermcap: stage_current
+all-expect: stage_current
 @endif gcc-bootstrap
-@if libtermcap
-TARGET-libtermcap=all
-maybe-all-libtermcap: all-libtermcap
-all-libtermcap: configure-libtermcap
+@if expect
+TARGET-expect=all
+maybe-all-expect: all-expect
+all-expect: configure-expect
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-libtermcap))
-@endif libtermcap
+               $(TARGET-expect))
+@endif expect
 
 
 
 
-.PHONY: check-libtermcap maybe-check-libtermcap
-maybe-check-libtermcap:
-@if libtermcap
-maybe-check-libtermcap: check-libtermcap
+.PHONY: check-expect maybe-check-expect
+maybe-check-expect:
+@if expect
+maybe-check-expect: check-expect
 
-check-libtermcap:
+check-expect:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/expect && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif libtermcap
+@endif expect
 
-.PHONY: install-libtermcap maybe-install-libtermcap
-maybe-install-libtermcap:
-@if libtermcap
-maybe-install-libtermcap: install-libtermcap
+.PHONY: install-expect maybe-install-expect
+maybe-install-expect:
+@if expect
+maybe-install-expect: install-expect
 
-install-libtermcap: installdirs
+install-expect: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif libtermcap
+@endif expect
 
-.PHONY: install-strip-libtermcap maybe-install-strip-libtermcap
-maybe-install-strip-libtermcap:
-@if libtermcap
-maybe-install-strip-libtermcap: install-strip-libtermcap
+.PHONY: install-strip-expect maybe-install-strip-expect
+maybe-install-strip-expect:
+@if expect
+maybe-install-strip-expect: install-strip-expect
 
-install-strip-libtermcap: installdirs
+install-strip-expect: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif libtermcap
+@endif expect
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-libtermcap info-libtermcap
-maybe-info-libtermcap:
-@if libtermcap
-maybe-info-libtermcap: info-libtermcap
+.PHONY: maybe-info-expect info-expect
+maybe-info-expect:
+@if expect
+maybe-info-expect: info-expect
 
-info-libtermcap: \
-    configure-libtermcap 
+info-expect: \
+    configure-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f ./expect/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 libtermcap"; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       echo "Doing info in expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34757,25 +35057,25 @@ info-libtermcap: \
                  info) \
          || exit 1
 
-@endif libtermcap
+@endif expect
 
-.PHONY: maybe-dvi-libtermcap dvi-libtermcap
-maybe-dvi-libtermcap:
-@if libtermcap
-maybe-dvi-libtermcap: dvi-libtermcap
+.PHONY: maybe-dvi-expect dvi-expect
+maybe-dvi-expect:
+@if expect
+maybe-dvi-expect: dvi-expect
 
-dvi-libtermcap: \
-    configure-libtermcap 
+dvi-expect: \
+    configure-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f ./expect/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 libtermcap"; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       echo "Doing dvi in expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34783,25 +35083,25 @@ dvi-libtermcap: \
                  dvi) \
          || exit 1
 
-@endif libtermcap
+@endif expect
 
-.PHONY: maybe-pdf-libtermcap pdf-libtermcap
-maybe-pdf-libtermcap:
-@if libtermcap
-maybe-pdf-libtermcap: pdf-libtermcap
+.PHONY: maybe-pdf-expect pdf-expect
+maybe-pdf-expect:
+@if expect
+maybe-pdf-expect: pdf-expect
 
-pdf-libtermcap: \
-    configure-libtermcap 
+pdf-expect: \
+    configure-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f ./expect/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 libtermcap"; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       echo "Doing pdf in expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34809,25 +35109,25 @@ pdf-libtermcap: \
                  pdf) \
          || exit 1
 
-@endif libtermcap
+@endif expect
 
-.PHONY: maybe-html-libtermcap html-libtermcap
-maybe-html-libtermcap:
-@if libtermcap
-maybe-html-libtermcap: html-libtermcap
+.PHONY: maybe-html-expect html-expect
+maybe-html-expect:
+@if expect
+maybe-html-expect: html-expect
 
-html-libtermcap: \
-    configure-libtermcap 
+html-expect: \
+    configure-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f ./expect/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 libtermcap"; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       echo "Doing html in expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34835,25 +35135,25 @@ html-libtermcap: \
                  html) \
          || exit 1
 
-@endif libtermcap
+@endif expect
 
-.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
-maybe-TAGS-libtermcap:
-@if libtermcap
-maybe-TAGS-libtermcap: TAGS-libtermcap
+.PHONY: maybe-TAGS-expect TAGS-expect
+maybe-TAGS-expect:
+@if expect
+maybe-TAGS-expect: TAGS-expect
 
-TAGS-libtermcap: \
-    configure-libtermcap 
+TAGS-expect: \
+    configure-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f ./expect/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 libtermcap"; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       echo "Doing TAGS in expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34861,26 +35161,26 @@ TAGS-libtermcap: \
                  TAGS) \
          || exit 1
 
-@endif libtermcap
+@endif expect
 
-.PHONY: maybe-install-info-libtermcap install-info-libtermcap
-maybe-install-info-libtermcap:
-@if libtermcap
-maybe-install-info-libtermcap: install-info-libtermcap
+.PHONY: maybe-install-info-expect install-info-expect
+maybe-install-info-expect:
+@if expect
+maybe-install-info-expect: install-info-expect
 
-install-info-libtermcap: \
-    configure-libtermcap \
-    info-libtermcap 
+install-info-expect: \
+    configure-expect \
+    info-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f ./expect/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 libtermcap"; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       echo "Doing install-info in expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34888,26 +35188,26 @@ install-info-libtermcap: \
                  install-info) \
          || exit 1
 
-@endif libtermcap
+@endif expect
 
-.PHONY: maybe-install-pdf-libtermcap install-pdf-libtermcap
-maybe-install-pdf-libtermcap:
-@if libtermcap
-maybe-install-pdf-libtermcap: install-pdf-libtermcap
+.PHONY: maybe-install-pdf-expect install-pdf-expect
+maybe-install-pdf-expect:
+@if expect
+maybe-install-pdf-expect: install-pdf-expect
 
-install-pdf-libtermcap: \
-    configure-libtermcap \
-    pdf-libtermcap 
+install-pdf-expect: \
+    configure-expect \
+    pdf-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f ./expect/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 libtermcap"; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       echo "Doing install-pdf in expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34915,26 +35215,26 @@ install-pdf-libtermcap: \
                  install-pdf) \
          || exit 1
 
-@endif libtermcap
+@endif expect
 
-.PHONY: maybe-install-html-libtermcap install-html-libtermcap
-maybe-install-html-libtermcap:
-@if libtermcap
-maybe-install-html-libtermcap: install-html-libtermcap
+.PHONY: maybe-install-html-expect install-html-expect
+maybe-install-html-expect:
+@if expect
+maybe-install-html-expect: install-html-expect
 
-install-html-libtermcap: \
-    configure-libtermcap \
-    html-libtermcap 
+install-html-expect: \
+    configure-expect \
+    html-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f ./expect/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 libtermcap"; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       echo "Doing install-html in expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34942,25 +35242,25 @@ install-html-libtermcap: \
                  install-html) \
          || exit 1
 
-@endif libtermcap
+@endif expect
 
-.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
-maybe-installcheck-libtermcap:
-@if libtermcap
-maybe-installcheck-libtermcap: installcheck-libtermcap
+.PHONY: maybe-installcheck-expect installcheck-expect
+maybe-installcheck-expect:
+@if expect
+maybe-installcheck-expect: installcheck-expect
 
-installcheck-libtermcap: \
-    configure-libtermcap 
+installcheck-expect: \
+    configure-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f ./expect/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 libtermcap"; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       echo "Doing installcheck in expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34968,163 +35268,229 @@ installcheck-libtermcap: \
                  installcheck) \
          || exit 1
 
-@endif libtermcap
+@endif expect
 
-.PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap
-maybe-mostlyclean-libtermcap:
-@if libtermcap
-maybe-mostlyclean-libtermcap: mostlyclean-libtermcap
+.PHONY: maybe-mostlyclean-expect mostlyclean-expect
+maybe-mostlyclean-expect:
+@if expect
+maybe-mostlyclean-expect: mostlyclean-expect
 
-# libtermcap doesn't support mostlyclean.
-mostlyclean-libtermcap:
+mostlyclean-expect: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./expect/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 expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
+         $(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 libtermcap
+@endif expect
 
-.PHONY: maybe-clean-libtermcap clean-libtermcap
-maybe-clean-libtermcap:
-@if libtermcap
-maybe-clean-libtermcap: clean-libtermcap
+.PHONY: maybe-clean-expect clean-expect
+maybe-clean-expect:
+@if expect
+maybe-clean-expect: clean-expect
 
-# libtermcap doesn't support clean.
-clean-libtermcap:
+clean-expect: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./expect/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 expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
+         $(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 libtermcap
+@endif expect
 
-.PHONY: maybe-distclean-libtermcap distclean-libtermcap
-maybe-distclean-libtermcap:
-@if libtermcap
-maybe-distclean-libtermcap: distclean-libtermcap
+.PHONY: maybe-distclean-expect distclean-expect
+maybe-distclean-expect:
+@if expect
+maybe-distclean-expect: distclean-expect
 
-# libtermcap doesn't support distclean.
-distclean-libtermcap:
+distclean-expect: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./expect/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 expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
+         $(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 libtermcap
+@endif expect
 
-.PHONY: maybe-maintainer-clean-libtermcap maintainer-clean-libtermcap
-maybe-maintainer-clean-libtermcap:
-@if libtermcap
-maybe-maintainer-clean-libtermcap: maintainer-clean-libtermcap
+.PHONY: maybe-maintainer-clean-expect maintainer-clean-expect
+maybe-maintainer-clean-expect:
+@if expect
+maybe-maintainer-clean-expect: maintainer-clean-expect
 
-# libtermcap doesn't support maintainer-clean.
-maintainer-clean-libtermcap:
+maintainer-clean-expect: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./expect/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 expect"; \
+       (cd $(HOST_SUBDIR)/expect && \
+         $(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 libtermcap
+@endif expect
 
 
 
-.PHONY: configure-utils maybe-configure-utils
-maybe-configure-utils:
+.PHONY: configure-guile maybe-configure-guile
+maybe-configure-guile:
 @if gcc-bootstrap
-configure-utils: stage_current
+configure-guile: stage_current
 @endif gcc-bootstrap
-@if utils
-maybe-configure-utils: configure-utils
-configure-utils: 
+@if guile
+maybe-configure-guile: configure-guile
+configure-guile: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils; \
+       test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/utils; \
-       cd "$(HOST_SUBDIR)/utils" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/guile; \
+       cd "$(HOST_SUBDIR)/guile" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=utils; \
+       module_srcdir=guile; \
        $(SHELL) \
          $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif utils
+@endif guile
 
 
 
 
 
-.PHONY: all-utils maybe-all-utils
-maybe-all-utils:
+.PHONY: all-guile maybe-all-guile
+maybe-all-guile:
 @if gcc-bootstrap
-all-utils: stage_current
+all-guile: stage_current
 @endif gcc-bootstrap
-@if utils
-TARGET-utils=all
-maybe-all-utils: all-utils
-all-utils: configure-utils
+@if guile
+TARGET-guile=all
+maybe-all-guile: all-guile
+all-guile: configure-guile
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/utils && \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-utils))
-@endif utils
+               $(TARGET-guile))
+@endif guile
 
 
 
 
-.PHONY: check-utils maybe-check-utils
-maybe-check-utils:
-@if utils
-maybe-check-utils: check-utils
+.PHONY: check-guile maybe-check-guile
+maybe-check-guile:
+@if guile
+maybe-check-guile: check-guile
 
-check-utils:
+check-guile:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/guile && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif utils
+@endif guile
 
-.PHONY: install-utils maybe-install-utils
-maybe-install-utils:
-@if utils
-maybe-install-utils: install-utils
+.PHONY: install-guile maybe-install-guile
+maybe-install-guile:
+@if guile
+maybe-install-guile: install-guile
 
-install-utils: installdirs
+install-guile: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/utils && \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif utils
+@endif guile
 
-.PHONY: install-strip-utils maybe-install-strip-utils
-maybe-install-strip-utils:
-@if utils
-maybe-install-strip-utils: install-strip-utils
+.PHONY: install-strip-guile maybe-install-strip-guile
+maybe-install-strip-guile:
+@if guile
+maybe-install-strip-guile: install-strip-guile
 
-install-strip-utils: installdirs
+install-strip-guile: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/utils && \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif utils
+@endif guile
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-utils info-utils
-maybe-info-utils:
-@if utils
-maybe-info-utils: info-utils
+.PHONY: maybe-info-guile info-guile
+maybe-info-guile:
+@if guile
+maybe-info-guile: info-guile
 
-info-utils: \
-    configure-utils 
+info-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing info in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35132,25 +35498,25 @@ info-utils: \
                  info) \
          || exit 1
 
-@endif utils
+@endif guile
 
-.PHONY: maybe-dvi-utils dvi-utils
-maybe-dvi-utils:
-@if utils
-maybe-dvi-utils: dvi-utils
+.PHONY: maybe-dvi-guile dvi-guile
+maybe-dvi-guile:
+@if guile
+maybe-dvi-guile: dvi-guile
 
-dvi-utils: \
-    configure-utils 
+dvi-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing dvi in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35158,25 +35524,25 @@ dvi-utils: \
                  dvi) \
          || exit 1
 
-@endif utils
+@endif guile
 
-.PHONY: maybe-pdf-utils pdf-utils
-maybe-pdf-utils:
-@if utils
-maybe-pdf-utils: pdf-utils
+.PHONY: maybe-pdf-guile pdf-guile
+maybe-pdf-guile:
+@if guile
+maybe-pdf-guile: pdf-guile
 
-pdf-utils: \
-    configure-utils 
+pdf-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing pdf in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35184,25 +35550,25 @@ pdf-utils: \
                  pdf) \
          || exit 1
 
-@endif utils
+@endif guile
 
-.PHONY: maybe-html-utils html-utils
-maybe-html-utils:
-@if utils
-maybe-html-utils: html-utils
+.PHONY: maybe-html-guile html-guile
+maybe-html-guile:
+@if guile
+maybe-html-guile: html-guile
 
-html-utils: \
-    configure-utils 
+html-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing html in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35210,25 +35576,25 @@ html-utils: \
                  html) \
          || exit 1
 
-@endif utils
+@endif guile
 
-.PHONY: maybe-TAGS-utils TAGS-utils
-maybe-TAGS-utils:
-@if utils
-maybe-TAGS-utils: TAGS-utils
+.PHONY: maybe-TAGS-guile TAGS-guile
+maybe-TAGS-guile:
+@if guile
+maybe-TAGS-guile: TAGS-guile
 
-TAGS-utils: \
-    configure-utils 
+TAGS-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing TAGS in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35236,26 +35602,26 @@ TAGS-utils: \
                  TAGS) \
          || exit 1
 
-@endif utils
+@endif guile
 
-.PHONY: maybe-install-info-utils install-info-utils
-maybe-install-info-utils:
-@if utils
-maybe-install-info-utils: install-info-utils
+.PHONY: maybe-install-info-guile install-info-guile
+maybe-install-info-guile:
+@if guile
+maybe-install-info-guile: install-info-guile
 
-install-info-utils: \
-    configure-utils \
-    info-utils 
+install-info-guile: \
+    configure-guile \
+    info-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing install-info in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35263,26 +35629,26 @@ install-info-utils: \
                  install-info) \
          || exit 1
 
-@endif utils
+@endif guile
 
-.PHONY: maybe-install-pdf-utils install-pdf-utils
-maybe-install-pdf-utils:
-@if utils
-maybe-install-pdf-utils: install-pdf-utils
+.PHONY: maybe-install-pdf-guile install-pdf-guile
+maybe-install-pdf-guile:
+@if guile
+maybe-install-pdf-guile: install-pdf-guile
 
-install-pdf-utils: \
-    configure-utils \
-    pdf-utils 
+install-pdf-guile: \
+    configure-guile \
+    pdf-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing install-pdf in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35290,26 +35656,26 @@ install-pdf-utils: \
                  install-pdf) \
          || exit 1
 
-@endif utils
+@endif guile
 
-.PHONY: maybe-install-html-utils install-html-utils
-maybe-install-html-utils:
-@if utils
-maybe-install-html-utils: install-html-utils
+.PHONY: maybe-install-html-guile install-html-guile
+maybe-install-html-guile:
+@if guile
+maybe-install-html-guile: install-html-guile
 
-install-html-utils: \
-    configure-utils \
-    html-utils 
+install-html-guile: \
+    configure-guile \
+    html-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing install-html in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35317,25 +35683,25 @@ install-html-utils: \
                  install-html) \
          || exit 1
 
-@endif utils
+@endif guile
 
-.PHONY: maybe-installcheck-utils installcheck-utils
-maybe-installcheck-utils:
-@if utils
-maybe-installcheck-utils: installcheck-utils
+.PHONY: maybe-installcheck-guile installcheck-guile
+maybe-installcheck-guile:
+@if guile
+maybe-installcheck-guile: installcheck-guile
 
-installcheck-utils: \
-    configure-utils 
+installcheck-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing installcheck in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35343,24 +35709,24 @@ installcheck-utils: \
                  installcheck) \
          || exit 1
 
-@endif utils
+@endif guile
 
-.PHONY: maybe-mostlyclean-utils mostlyclean-utils
-maybe-mostlyclean-utils:
-@if utils
-maybe-mostlyclean-utils: mostlyclean-utils
+.PHONY: maybe-mostlyclean-guile mostlyclean-guile
+maybe-mostlyclean-guile:
+@if guile
+maybe-mostlyclean-guile: mostlyclean-guile
 
-mostlyclean-utils: 
+mostlyclean-guile: 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing mostlyclean in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35368,24 +35734,24 @@ mostlyclean-utils:
                  mostlyclean) \
          || exit 1
 
-@endif utils
+@endif guile
 
-.PHONY: maybe-clean-utils clean-utils
-maybe-clean-utils:
-@if utils
-maybe-clean-utils: clean-utils
+.PHONY: maybe-clean-guile clean-guile
+maybe-clean-guile:
+@if guile
+maybe-clean-guile: clean-guile
 
-clean-utils: 
+clean-guile: 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing clean in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35393,24 +35759,24 @@ clean-utils:
                  clean) \
          || exit 1
 
-@endif utils
+@endif guile
 
-.PHONY: maybe-distclean-utils distclean-utils
-maybe-distclean-utils:
-@if utils
-maybe-distclean-utils: distclean-utils
+.PHONY: maybe-distclean-guile distclean-guile
+maybe-distclean-guile:
+@if guile
+maybe-distclean-guile: distclean-guile
 
-distclean-utils: 
+distclean-guile: 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing distclean in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35418,24 +35784,24 @@ distclean-utils:
                  distclean) \
          || exit 1
 
-@endif utils
+@endif guile
 
-.PHONY: maybe-maintainer-clean-utils maintainer-clean-utils
-maybe-maintainer-clean-utils:
-@if utils
-maybe-maintainer-clean-utils: maintainer-clean-utils
+.PHONY: maybe-maintainer-clean-guile maintainer-clean-guile
+maybe-maintainer-clean-guile:
+@if guile
+maybe-maintainer-clean-guile: maintainer-clean-guile
 
-maintainer-clean-utils: 
+maintainer-clean-guile: 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f ./guile/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 utils"; \
-       (cd $(HOST_SUBDIR)/utils && \
+       echo "Doing maintainer-clean in guile"; \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35443,129 +35809,129 @@ maintainer-clean-utils:
                  maintainer-clean) \
          || exit 1
 
-@endif utils
+@endif guile
 
 
 
-.PHONY: configure-gnattools maybe-configure-gnattools
-maybe-configure-gnattools:
+.PHONY: configure-tk maybe-configure-tk
+maybe-configure-tk:
 @if gcc-bootstrap
-configure-gnattools: stage_current
+configure-tk: stage_current
 @endif gcc-bootstrap
-@if gnattools
-maybe-configure-gnattools: configure-gnattools
-configure-gnattools: 
+@if tk
+maybe-configure-tk: configure-tk
+configure-tk: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools; \
+       test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gnattools; \
-       cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/tk; \
+       cd "$(HOST_SUBDIR)/tk" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=gnattools; \
+       module_srcdir=tk; \
        $(SHELL) \
          $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif gnattools
+@endif tk
 
 
 
 
 
-.PHONY: all-gnattools maybe-all-gnattools
-maybe-all-gnattools:
+.PHONY: all-tk maybe-all-tk
+maybe-all-tk:
 @if gcc-bootstrap
-all-gnattools: stage_current
+all-tk: stage_current
 @endif gcc-bootstrap
-@if gnattools
-TARGET-gnattools=all
-maybe-all-gnattools: all-gnattools
-all-gnattools: configure-gnattools
+@if tk
+TARGET-tk=all
+maybe-all-tk: all-tk
+all-tk: configure-tk
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-gnattools))
-@endif gnattools
+               $(TARGET-tk))
+@endif tk
 
 
 
 
-.PHONY: check-gnattools maybe-check-gnattools
-maybe-check-gnattools:
-@if gnattools
-maybe-check-gnattools: check-gnattools
+.PHONY: check-tk maybe-check-tk
+maybe-check-tk:
+@if tk
+maybe-check-tk: check-tk
 
-check-gnattools:
+check-tk:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif gnattools
+@endif tk
 
-.PHONY: install-gnattools maybe-install-gnattools
-maybe-install-gnattools:
-@if gnattools
-maybe-install-gnattools: install-gnattools
+.PHONY: install-tk maybe-install-tk
+maybe-install-tk:
+@if tk
+maybe-install-tk: install-tk
 
-install-gnattools: installdirs
+install-tk: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif gnattools
+@endif tk
 
-.PHONY: install-strip-gnattools maybe-install-strip-gnattools
-maybe-install-strip-gnattools:
-@if gnattools
-maybe-install-strip-gnattools: install-strip-gnattools
+.PHONY: install-strip-tk maybe-install-strip-tk
+maybe-install-strip-tk:
+@if tk
+maybe-install-strip-tk: install-strip-tk
 
-install-strip-gnattools: installdirs
+install-strip-tk: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif gnattools
+@endif tk
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-gnattools info-gnattools
-maybe-info-gnattools:
-@if gnattools
-maybe-info-gnattools: info-gnattools
+.PHONY: maybe-info-tk info-tk
+maybe-info-tk:
+@if tk
+maybe-info-tk: info-tk
 
-info-gnattools: \
-    configure-gnattools 
+info-tk: \
+    configure-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing info in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35573,25 +35939,25 @@ info-gnattools: \
                  info) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
-.PHONY: maybe-dvi-gnattools dvi-gnattools
-maybe-dvi-gnattools:
-@if gnattools
-maybe-dvi-gnattools: dvi-gnattools
+.PHONY: maybe-dvi-tk dvi-tk
+maybe-dvi-tk:
+@if tk
+maybe-dvi-tk: dvi-tk
 
-dvi-gnattools: \
-    configure-gnattools 
+dvi-tk: \
+    configure-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing dvi in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35599,25 +35965,25 @@ dvi-gnattools: \
                  dvi) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
-.PHONY: maybe-pdf-gnattools pdf-gnattools
-maybe-pdf-gnattools:
-@if gnattools
-maybe-pdf-gnattools: pdf-gnattools
+.PHONY: maybe-pdf-tk pdf-tk
+maybe-pdf-tk:
+@if tk
+maybe-pdf-tk: pdf-tk
 
-pdf-gnattools: \
-    configure-gnattools 
+pdf-tk: \
+    configure-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing pdf in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35625,25 +35991,25 @@ pdf-gnattools: \
                  pdf) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
-.PHONY: maybe-html-gnattools html-gnattools
-maybe-html-gnattools:
-@if gnattools
-maybe-html-gnattools: html-gnattools
+.PHONY: maybe-html-tk html-tk
+maybe-html-tk:
+@if tk
+maybe-html-tk: html-tk
 
-html-gnattools: \
-    configure-gnattools 
+html-tk: \
+    configure-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing html in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35651,25 +36017,25 @@ html-gnattools: \
                  html) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
-.PHONY: maybe-TAGS-gnattools TAGS-gnattools
-maybe-TAGS-gnattools:
-@if gnattools
-maybe-TAGS-gnattools: TAGS-gnattools
+.PHONY: maybe-TAGS-tk TAGS-tk
+maybe-TAGS-tk:
+@if tk
+maybe-TAGS-tk: TAGS-tk
 
-TAGS-gnattools: \
-    configure-gnattools 
+TAGS-tk: \
+    configure-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing TAGS in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35677,26 +36043,26 @@ TAGS-gnattools: \
                  TAGS) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
-.PHONY: maybe-install-info-gnattools install-info-gnattools
-maybe-install-info-gnattools:
-@if gnattools
-maybe-install-info-gnattools: install-info-gnattools
+.PHONY: maybe-install-info-tk install-info-tk
+maybe-install-info-tk:
+@if tk
+maybe-install-info-tk: install-info-tk
 
-install-info-gnattools: \
-    configure-gnattools \
-    info-gnattools 
+install-info-tk: \
+    configure-tk \
+    info-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing install-info in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35704,26 +36070,26 @@ install-info-gnattools: \
                  install-info) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
-.PHONY: maybe-install-pdf-gnattools install-pdf-gnattools
-maybe-install-pdf-gnattools:
-@if gnattools
-maybe-install-pdf-gnattools: install-pdf-gnattools
+.PHONY: maybe-install-pdf-tk install-pdf-tk
+maybe-install-pdf-tk:
+@if tk
+maybe-install-pdf-tk: install-pdf-tk
 
-install-pdf-gnattools: \
-    configure-gnattools \
-    pdf-gnattools 
+install-pdf-tk: \
+    configure-tk \
+    pdf-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing install-pdf in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35731,26 +36097,26 @@ install-pdf-gnattools: \
                  install-pdf) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
-.PHONY: maybe-install-html-gnattools install-html-gnattools
-maybe-install-html-gnattools:
-@if gnattools
-maybe-install-html-gnattools: install-html-gnattools
+.PHONY: maybe-install-html-tk install-html-tk
+maybe-install-html-tk:
+@if tk
+maybe-install-html-tk: install-html-tk
 
-install-html-gnattools: \
-    configure-gnattools \
-    html-gnattools 
+install-html-tk: \
+    configure-tk \
+    html-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing install-html in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35758,25 +36124,25 @@ install-html-gnattools: \
                  install-html) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
-.PHONY: maybe-installcheck-gnattools installcheck-gnattools
-maybe-installcheck-gnattools:
-@if gnattools
-maybe-installcheck-gnattools: installcheck-gnattools
+.PHONY: maybe-installcheck-tk installcheck-tk
+maybe-installcheck-tk:
+@if tk
+maybe-installcheck-tk: installcheck-tk
 
-installcheck-gnattools: \
-    configure-gnattools 
+installcheck-tk: \
+    configure-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing installcheck in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35784,24 +36150,24 @@ installcheck-gnattools: \
                  installcheck) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
-.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools
-maybe-mostlyclean-gnattools:
-@if gnattools
-maybe-mostlyclean-gnattools: mostlyclean-gnattools
+.PHONY: maybe-mostlyclean-tk mostlyclean-tk
+maybe-mostlyclean-tk:
+@if tk
+maybe-mostlyclean-tk: mostlyclean-tk
 
-mostlyclean-gnattools: 
+mostlyclean-tk: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing mostlyclean in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35809,24 +36175,24 @@ mostlyclean-gnattools:
                  mostlyclean) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
-.PHONY: maybe-clean-gnattools clean-gnattools
-maybe-clean-gnattools:
-@if gnattools
-maybe-clean-gnattools: clean-gnattools
+.PHONY: maybe-clean-tk clean-tk
+maybe-clean-tk:
+@if tk
+maybe-clean-tk: clean-tk
 
-clean-gnattools: 
+clean-tk: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing clean in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35834,24 +36200,24 @@ clean-gnattools:
                  clean) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
-.PHONY: maybe-distclean-gnattools distclean-gnattools
-maybe-distclean-gnattools:
-@if gnattools
-maybe-distclean-gnattools: distclean-gnattools
+.PHONY: maybe-distclean-tk distclean-tk
+maybe-distclean-tk:
+@if tk
+maybe-distclean-tk: distclean-tk
 
-distclean-gnattools: 
+distclean-tk: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing distclean in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35859,24 +36225,24 @@ distclean-gnattools:
                  distclean) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
-.PHONY: maybe-maintainer-clean-gnattools maintainer-clean-gnattools
-maybe-maintainer-clean-gnattools:
-@if gnattools
-maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
+.PHONY: maybe-maintainer-clean-tk maintainer-clean-tk
+maybe-maintainer-clean-tk:
+@if tk
+maybe-maintainer-clean-tk: maintainer-clean-tk
 
-maintainer-clean-gnattools: 
+maintainer-clean-tk: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f ./tk/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 gnattools"; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       echo "Doing maintainer-clean in tk"; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35884,93 +36250,1344 @@ maintainer-clean-gnattools:
                  maintainer-clean) \
          || exit 1
 
-@endif gnattools
+@endif tk
 
 
 
-.PHONY: configure-lto-plugin maybe-configure-lto-plugin
-maybe-configure-lto-plugin:
+.PHONY: configure-libtermcap maybe-configure-libtermcap
+maybe-configure-libtermcap:
 @if gcc-bootstrap
-configure-lto-plugin: stage_current
+configure-libtermcap: stage_current
 @endif gcc-bootstrap
-@if lto-plugin
-maybe-configure-lto-plugin: configure-lto-plugin
-configure-lto-plugin: 
+@if libtermcap
+maybe-configure-libtermcap: configure-libtermcap
+configure-libtermcap: 
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
+       test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/lto-plugin; \
-       cd "$(HOST_SUBDIR)/lto-plugin" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libtermcap; \
+       cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=lto-plugin; \
+       module_srcdir=libtermcap; \
        $(SHELL) \
          $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \
+         --target=${target_alias}  \
          || exit 1
-@endif lto-plugin
+@endif libtermcap
 
 
 
-.PHONY: configure-stage1-lto-plugin maybe-configure-stage1-lto-plugin
-maybe-configure-stage1-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-configure-stage1-lto-plugin: configure-stage1-lto-plugin
-configure-stage1-lto-plugin:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/lto-plugin/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)/lto-plugin; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
-       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       module_srcdir=lto-plugin; \
-       $(SHELL) $$s/$$module_srcdir/configure \
-         --srcdir=$${topdir}/$$module_srcdir \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} \
-          \
-         $(STAGE1_CONFIGURE_FLAGS) \
-         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
-@endif lto-plugin-bootstrap
 
-.PHONY: configure-stage2-lto-plugin maybe-configure-stage2-lto-plugin
-maybe-configure-stage2-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-configure-stage2-lto-plugin: configure-stage2-lto-plugin
-configure-stage2-lto-plugin:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+
+.PHONY: all-libtermcap maybe-all-libtermcap
+maybe-all-libtermcap:
+@if gcc-bootstrap
+all-libtermcap: stage_current
+@endif gcc-bootstrap
+@if libtermcap
+TARGET-libtermcap=all
+maybe-all-libtermcap: all-libtermcap
+all-libtermcap: configure-libtermcap
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/lto-plugin/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)/lto-plugin; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
-       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libtermcap))
+@endif libtermcap
+
+
+
+
+.PHONY: check-libtermcap maybe-check-libtermcap
+maybe-check-libtermcap:
+@if libtermcap
+maybe-check-libtermcap: check-libtermcap
+
+check-libtermcap:
+
+@endif libtermcap
+
+.PHONY: install-libtermcap maybe-install-libtermcap
+maybe-install-libtermcap:
+@if libtermcap
+maybe-install-libtermcap: install-libtermcap
+
+install-libtermcap: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif libtermcap
+
+.PHONY: install-strip-libtermcap maybe-install-strip-libtermcap
+maybe-install-strip-libtermcap:
+@if libtermcap
+maybe-install-strip-libtermcap: install-strip-libtermcap
+
+install-strip-libtermcap: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif libtermcap
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libtermcap info-libtermcap
+maybe-info-libtermcap:
+@if libtermcap
+maybe-info-libtermcap: info-libtermcap
+
+info-libtermcap: \
+    configure-libtermcap 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libtermcap/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 libtermcap"; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(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 libtermcap
+
+.PHONY: maybe-dvi-libtermcap dvi-libtermcap
+maybe-dvi-libtermcap:
+@if libtermcap
+maybe-dvi-libtermcap: dvi-libtermcap
+
+dvi-libtermcap: \
+    configure-libtermcap 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libtermcap/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 libtermcap"; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(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 libtermcap
+
+.PHONY: maybe-pdf-libtermcap pdf-libtermcap
+maybe-pdf-libtermcap:
+@if libtermcap
+maybe-pdf-libtermcap: pdf-libtermcap
+
+pdf-libtermcap: \
+    configure-libtermcap 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libtermcap/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 libtermcap"; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(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 libtermcap
+
+.PHONY: maybe-html-libtermcap html-libtermcap
+maybe-html-libtermcap:
+@if libtermcap
+maybe-html-libtermcap: html-libtermcap
+
+html-libtermcap: \
+    configure-libtermcap 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libtermcap/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 libtermcap"; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(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 libtermcap
+
+.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
+maybe-TAGS-libtermcap:
+@if libtermcap
+maybe-TAGS-libtermcap: TAGS-libtermcap
+
+TAGS-libtermcap: \
+    configure-libtermcap 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libtermcap/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 libtermcap"; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(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 libtermcap
+
+.PHONY: maybe-install-info-libtermcap install-info-libtermcap
+maybe-install-info-libtermcap:
+@if libtermcap
+maybe-install-info-libtermcap: install-info-libtermcap
+
+install-info-libtermcap: \
+    configure-libtermcap \
+    info-libtermcap 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libtermcap/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 libtermcap"; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(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 libtermcap
+
+.PHONY: maybe-install-pdf-libtermcap install-pdf-libtermcap
+maybe-install-pdf-libtermcap:
+@if libtermcap
+maybe-install-pdf-libtermcap: install-pdf-libtermcap
+
+install-pdf-libtermcap: \
+    configure-libtermcap \
+    pdf-libtermcap 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libtermcap/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 libtermcap"; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(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 libtermcap
+
+.PHONY: maybe-install-html-libtermcap install-html-libtermcap
+maybe-install-html-libtermcap:
+@if libtermcap
+maybe-install-html-libtermcap: install-html-libtermcap
+
+install-html-libtermcap: \
+    configure-libtermcap \
+    html-libtermcap 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libtermcap/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 libtermcap"; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(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 libtermcap
+
+.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
+maybe-installcheck-libtermcap:
+@if libtermcap
+maybe-installcheck-libtermcap: installcheck-libtermcap
+
+installcheck-libtermcap: \
+    configure-libtermcap 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libtermcap/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 libtermcap"; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(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 libtermcap
+
+.PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap
+maybe-mostlyclean-libtermcap:
+@if libtermcap
+maybe-mostlyclean-libtermcap: mostlyclean-libtermcap
+
+# libtermcap doesn't support mostlyclean.
+mostlyclean-libtermcap:
+
+@endif libtermcap
+
+.PHONY: maybe-clean-libtermcap clean-libtermcap
+maybe-clean-libtermcap:
+@if libtermcap
+maybe-clean-libtermcap: clean-libtermcap
+
+# libtermcap doesn't support clean.
+clean-libtermcap:
+
+@endif libtermcap
+
+.PHONY: maybe-distclean-libtermcap distclean-libtermcap
+maybe-distclean-libtermcap:
+@if libtermcap
+maybe-distclean-libtermcap: distclean-libtermcap
+
+# libtermcap doesn't support distclean.
+distclean-libtermcap:
+
+@endif libtermcap
+
+.PHONY: maybe-maintainer-clean-libtermcap maintainer-clean-libtermcap
+maybe-maintainer-clean-libtermcap:
+@if libtermcap
+maybe-maintainer-clean-libtermcap: maintainer-clean-libtermcap
+
+# libtermcap doesn't support maintainer-clean.
+maintainer-clean-libtermcap:
+
+@endif libtermcap
+
+
+
+.PHONY: configure-utils maybe-configure-utils
+maybe-configure-utils:
+@if gcc-bootstrap
+configure-utils: stage_current
+@endif gcc-bootstrap
+@if utils
+maybe-configure-utils: configure-utils
+configure-utils: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/utils; \
+       cd "$(HOST_SUBDIR)/utils" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=utils; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias}  \
+         || exit 1
+@endif utils
+
+
+
+
+
+.PHONY: all-utils maybe-all-utils
+maybe-all-utils:
+@if gcc-bootstrap
+all-utils: stage_current
+@endif gcc-bootstrap
+@if utils
+TARGET-utils=all
+maybe-all-utils: all-utils
+all-utils: configure-utils
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-utils))
+@endif utils
+
+
+
+
+.PHONY: check-utils maybe-check-utils
+maybe-check-utils:
+@if utils
+maybe-check-utils: check-utils
+
+check-utils:
+
+@endif utils
+
+.PHONY: install-utils maybe-install-utils
+maybe-install-utils:
+@if utils
+maybe-install-utils: install-utils
+
+install-utils: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif utils
+
+.PHONY: install-strip-utils maybe-install-strip-utils
+maybe-install-strip-utils:
+@if utils
+maybe-install-strip-utils: install-strip-utils
+
+install-strip-utils: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif utils
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-utils info-utils
+maybe-info-utils:
+@if utils
+maybe-info-utils: info-utils
+
+info-utils: \
+    configure-utils 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+.PHONY: maybe-dvi-utils dvi-utils
+maybe-dvi-utils:
+@if utils
+maybe-dvi-utils: dvi-utils
+
+dvi-utils: \
+    configure-utils 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+.PHONY: maybe-pdf-utils pdf-utils
+maybe-pdf-utils:
+@if utils
+maybe-pdf-utils: pdf-utils
+
+pdf-utils: \
+    configure-utils 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+.PHONY: maybe-html-utils html-utils
+maybe-html-utils:
+@if utils
+maybe-html-utils: html-utils
+
+html-utils: \
+    configure-utils 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+.PHONY: maybe-TAGS-utils TAGS-utils
+maybe-TAGS-utils:
+@if utils
+maybe-TAGS-utils: TAGS-utils
+
+TAGS-utils: \
+    configure-utils 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+.PHONY: maybe-install-info-utils install-info-utils
+maybe-install-info-utils:
+@if utils
+maybe-install-info-utils: install-info-utils
+
+install-info-utils: \
+    configure-utils \
+    info-utils 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+.PHONY: maybe-install-pdf-utils install-pdf-utils
+maybe-install-pdf-utils:
+@if utils
+maybe-install-pdf-utils: install-pdf-utils
+
+install-pdf-utils: \
+    configure-utils \
+    pdf-utils 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+.PHONY: maybe-install-html-utils install-html-utils
+maybe-install-html-utils:
+@if utils
+maybe-install-html-utils: install-html-utils
+
+install-html-utils: \
+    configure-utils \
+    html-utils 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+.PHONY: maybe-installcheck-utils installcheck-utils
+maybe-installcheck-utils:
+@if utils
+maybe-installcheck-utils: installcheck-utils
+
+installcheck-utils: \
+    configure-utils 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+.PHONY: maybe-mostlyclean-utils mostlyclean-utils
+maybe-mostlyclean-utils:
+@if utils
+maybe-mostlyclean-utils: mostlyclean-utils
+
+mostlyclean-utils: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+.PHONY: maybe-clean-utils clean-utils
+maybe-clean-utils:
+@if utils
+maybe-clean-utils: clean-utils
+
+clean-utils: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+.PHONY: maybe-distclean-utils distclean-utils
+maybe-distclean-utils:
+@if utils
+maybe-distclean-utils: distclean-utils
+
+distclean-utils: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+.PHONY: maybe-maintainer-clean-utils maintainer-clean-utils
+maybe-maintainer-clean-utils:
+@if utils
+maybe-maintainer-clean-utils: maintainer-clean-utils
+
+maintainer-clean-utils: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./utils/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 utils"; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(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 utils
+
+
+
+.PHONY: configure-gnattools maybe-configure-gnattools
+maybe-configure-gnattools:
+@if gcc-bootstrap
+configure-gnattools: stage_current
+@endif gcc-bootstrap
+@if gnattools
+maybe-configure-gnattools: configure-gnattools
+configure-gnattools: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/gnattools; \
+       cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=gnattools; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias}  \
+         || exit 1
+@endif gnattools
+
+
+
+
+
+.PHONY: all-gnattools maybe-all-gnattools
+maybe-all-gnattools:
+@if gcc-bootstrap
+all-gnattools: stage_current
+@endif gcc-bootstrap
+@if gnattools
+TARGET-gnattools=all
+maybe-all-gnattools: all-gnattools
+all-gnattools: configure-gnattools
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gnattools))
+@endif gnattools
+
+
+
+
+.PHONY: check-gnattools maybe-check-gnattools
+maybe-check-gnattools:
+@if gnattools
+maybe-check-gnattools: check-gnattools
+
+check-gnattools:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif gnattools
+
+.PHONY: install-gnattools maybe-install-gnattools
+maybe-install-gnattools:
+@if gnattools
+maybe-install-gnattools: install-gnattools
+
+install-gnattools: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif gnattools
+
+.PHONY: install-strip-gnattools maybe-install-strip-gnattools
+maybe-install-strip-gnattools:
+@if gnattools
+maybe-install-strip-gnattools: install-strip-gnattools
+
+install-strip-gnattools: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gnattools
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gnattools info-gnattools
+maybe-info-gnattools:
+@if gnattools
+maybe-info-gnattools: info-gnattools
+
+info-gnattools: \
+    configure-gnattools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+.PHONY: maybe-dvi-gnattools dvi-gnattools
+maybe-dvi-gnattools:
+@if gnattools
+maybe-dvi-gnattools: dvi-gnattools
+
+dvi-gnattools: \
+    configure-gnattools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+.PHONY: maybe-pdf-gnattools pdf-gnattools
+maybe-pdf-gnattools:
+@if gnattools
+maybe-pdf-gnattools: pdf-gnattools
+
+pdf-gnattools: \
+    configure-gnattools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+.PHONY: maybe-html-gnattools html-gnattools
+maybe-html-gnattools:
+@if gnattools
+maybe-html-gnattools: html-gnattools
+
+html-gnattools: \
+    configure-gnattools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+.PHONY: maybe-TAGS-gnattools TAGS-gnattools
+maybe-TAGS-gnattools:
+@if gnattools
+maybe-TAGS-gnattools: TAGS-gnattools
+
+TAGS-gnattools: \
+    configure-gnattools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+.PHONY: maybe-install-info-gnattools install-info-gnattools
+maybe-install-info-gnattools:
+@if gnattools
+maybe-install-info-gnattools: install-info-gnattools
+
+install-info-gnattools: \
+    configure-gnattools \
+    info-gnattools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+.PHONY: maybe-install-pdf-gnattools install-pdf-gnattools
+maybe-install-pdf-gnattools:
+@if gnattools
+maybe-install-pdf-gnattools: install-pdf-gnattools
+
+install-pdf-gnattools: \
+    configure-gnattools \
+    pdf-gnattools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+.PHONY: maybe-install-html-gnattools install-html-gnattools
+maybe-install-html-gnattools:
+@if gnattools
+maybe-install-html-gnattools: install-html-gnattools
+
+install-html-gnattools: \
+    configure-gnattools \
+    html-gnattools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+.PHONY: maybe-installcheck-gnattools installcheck-gnattools
+maybe-installcheck-gnattools:
+@if gnattools
+maybe-installcheck-gnattools: installcheck-gnattools
+
+installcheck-gnattools: \
+    configure-gnattools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools
+maybe-mostlyclean-gnattools:
+@if gnattools
+maybe-mostlyclean-gnattools: mostlyclean-gnattools
+
+mostlyclean-gnattools: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+.PHONY: maybe-clean-gnattools clean-gnattools
+maybe-clean-gnattools:
+@if gnattools
+maybe-clean-gnattools: clean-gnattools
+
+clean-gnattools: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+.PHONY: maybe-distclean-gnattools distclean-gnattools
+maybe-distclean-gnattools:
+@if gnattools
+maybe-distclean-gnattools: distclean-gnattools
+
+distclean-gnattools: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+.PHONY: maybe-maintainer-clean-gnattools maintainer-clean-gnattools
+maybe-maintainer-clean-gnattools:
+@if gnattools
+maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
+
+maintainer-clean-gnattools: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gnattools/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 gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(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 gnattools
+
+
+
+.PHONY: configure-lto-plugin maybe-configure-lto-plugin
+maybe-configure-lto-plugin:
+@if gcc-bootstrap
+configure-lto-plugin: stage_current
+@endif gcc-bootstrap
+@if lto-plugin
+maybe-configure-lto-plugin: configure-lto-plugin
+configure-lto-plugin: 
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/lto-plugin; \
+       cd "$(HOST_SUBDIR)/lto-plugin" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=lto-plugin; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \
+         || exit 1
+@endif lto-plugin
+
+
+
+.PHONY: configure-stage1-lto-plugin maybe-configure-stage1-lto-plugin
+maybe-configure-stage1-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stage1-lto-plugin: configure-stage1-lto-plugin
+configure-stage1-lto-plugin:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/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)/lto-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
+       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stage2-lto-plugin maybe-configure-stage2-lto-plugin
+maybe-configure-stage2-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stage2-lto-plugin: configure-stage2-lto-plugin
+configure-stage2-lto-plugin:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/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)/lto-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
+       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
@@ -36265,6 +37882,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)" \
@@ -36309,6 +37927,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)" \
@@ -36351,6 +37970,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)" \
@@ -36393,6 +38013,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)" \
@@ -36435,6 +38056,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)" \
@@ -36477,6 +38099,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)" \
@@ -36519,6 +38142,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)" \
@@ -36561,6 +38185,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)" \
@@ -36603,6 +38228,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)" \
@@ -37884,1290 +39510,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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       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-libstdc++-v3-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:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(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 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="$(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 libctf-bootstrap
+
+.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 $(HOST_SUBDIR)/libctf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       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 $(HOST_SUBDIR)/libctf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libctf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(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 \
@@ -39175,452 +40654,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)" \
@@ -39632,39 +41111,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)" \
@@ -39675,38 +41154,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)" \
@@ -39717,38 +41196,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)" \
@@ -39759,38 +41238,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)" \
@@ -39801,38 +41280,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)" \
@@ -39843,38 +41322,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)" \
@@ -39885,38 +41364,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)" \
@@ -39927,38 +41406,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)" \
@@ -39969,90 +41448,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}" \
@@ -40060,25 +41539,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}" \
@@ -40086,25 +41565,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}" \
@@ -40112,25 +41591,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}" \
@@ -40138,25 +41617,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}" \
@@ -40164,26 +41643,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}" \
@@ -40191,26 +41670,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}" \
@@ -40218,26 +41697,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}" \
@@ -40245,25 +41724,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}" \
@@ -40271,24 +41750,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}" \
@@ -40296,24 +41775,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}" \
@@ -40321,24 +41800,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}" \
@@ -40346,24 +41825,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}" \
@@ -40371,46 +41850,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 \
@@ -40418,452 +41897,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)" \
@@ -40872,42 +42351,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)" \
@@ -40916,40 +42395,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)" \
@@ -40958,40 +42437,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)" \
@@ -41000,40 +42479,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)" \
@@ -41042,40 +42521,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)" \
@@ -41084,40 +42563,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)" \
@@ -41126,40 +42605,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)" \
@@ -41168,40 +42647,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)" \
@@ -41210,92 +42689,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}" \
@@ -41303,25 +42782,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}" \
@@ -41329,25 +42808,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}" \
@@ -41355,25 +42834,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}" \
@@ -41381,25 +42860,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}" \
@@ -41407,26 +42886,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}" \
@@ -41434,26 +42913,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}" \
@@ -41461,26 +42940,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}" \
@@ -41488,25 +42967,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}" \
@@ -41514,24 +42993,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}" \
@@ -41539,24 +43018,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}" \
@@ -41564,24 +43043,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}" \
@@ -41589,24 +43068,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}" \
@@ -41614,7 +43093,7 @@ maintainer-clean-target-libmpx:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libmpx
+@endif target-libsanitizer
 
 
 
@@ -42863,464 +44342,6 @@ maintainer-clean-target-libvtv:
 
 
 
-.PHONY: configure-target-libcilkrts maybe-configure-target-libcilkrts
-maybe-configure-target-libcilkrts:
-@if gcc-bootstrap
-configure-target-libcilkrts: stage_current
-@endif gcc-bootstrap
-@if target-libcilkrts
-maybe-configure-target-libcilkrts: configure-target-libcilkrts
-configure-target-libcilkrts: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libcilkrts..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libcilkrts/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libcilkrts/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libcilkrts/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libcilkrts/Makefile; \
-           mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libcilkrts/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libcilkrts; \
-       cd "$(TARGET_SUBDIR)/libcilkrts" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libcilkrts/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       module_srcdir=libcilkrts; \
-       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-libcilkrts
-
-
-
-
-
-.PHONY: all-target-libcilkrts maybe-all-target-libcilkrts
-maybe-all-target-libcilkrts:
-@if gcc-bootstrap
-all-target-libcilkrts: stage_current
-@endif gcc-bootstrap
-@if target-libcilkrts
-TARGET-target-libcilkrts=all
-maybe-all-target-libcilkrts: all-target-libcilkrts
-all-target-libcilkrts: configure-target-libcilkrts
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
-               $(TARGET-target-libcilkrts))
-@endif target-libcilkrts
-
-
-
-
-
-.PHONY: check-target-libcilkrts maybe-check-target-libcilkrts
-maybe-check-target-libcilkrts:
-@if target-libcilkrts
-maybe-check-target-libcilkrts: check-target-libcilkrts
-
-check-target-libcilkrts:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libcilkrts
-
-.PHONY: install-target-libcilkrts maybe-install-target-libcilkrts
-maybe-install-target-libcilkrts:
-@if target-libcilkrts
-maybe-install-target-libcilkrts: install-target-libcilkrts
-
-install-target-libcilkrts: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libcilkrts
-
-.PHONY: install-strip-target-libcilkrts maybe-install-strip-target-libcilkrts
-maybe-install-strip-target-libcilkrts:
-@if target-libcilkrts
-maybe-install-strip-target-libcilkrts: install-strip-target-libcilkrts
-
-install-strip-target-libcilkrts: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
-
-@endif target-libcilkrts
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-target-libcilkrts info-target-libcilkrts
-maybe-info-target-libcilkrts:
-@if target-libcilkrts
-maybe-info-target-libcilkrts: info-target-libcilkrts
-
-info-target-libcilkrts: \
-    configure-target-libcilkrts 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-.PHONY: maybe-dvi-target-libcilkrts dvi-target-libcilkrts
-maybe-dvi-target-libcilkrts:
-@if target-libcilkrts
-maybe-dvi-target-libcilkrts: dvi-target-libcilkrts
-
-dvi-target-libcilkrts: \
-    configure-target-libcilkrts 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-.PHONY: maybe-pdf-target-libcilkrts pdf-target-libcilkrts
-maybe-pdf-target-libcilkrts:
-@if target-libcilkrts
-maybe-pdf-target-libcilkrts: pdf-target-libcilkrts
-
-pdf-target-libcilkrts: \
-    configure-target-libcilkrts 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-.PHONY: maybe-html-target-libcilkrts html-target-libcilkrts
-maybe-html-target-libcilkrts:
-@if target-libcilkrts
-maybe-html-target-libcilkrts: html-target-libcilkrts
-
-html-target-libcilkrts: \
-    configure-target-libcilkrts 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-.PHONY: maybe-TAGS-target-libcilkrts TAGS-target-libcilkrts
-maybe-TAGS-target-libcilkrts:
-@if target-libcilkrts
-maybe-TAGS-target-libcilkrts: TAGS-target-libcilkrts
-
-TAGS-target-libcilkrts: \
-    configure-target-libcilkrts 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-.PHONY: maybe-install-info-target-libcilkrts install-info-target-libcilkrts
-maybe-install-info-target-libcilkrts:
-@if target-libcilkrts
-maybe-install-info-target-libcilkrts: install-info-target-libcilkrts
-
-install-info-target-libcilkrts: \
-    configure-target-libcilkrts \
-    info-target-libcilkrts 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-.PHONY: maybe-install-pdf-target-libcilkrts install-pdf-target-libcilkrts
-maybe-install-pdf-target-libcilkrts:
-@if target-libcilkrts
-maybe-install-pdf-target-libcilkrts: install-pdf-target-libcilkrts
-
-install-pdf-target-libcilkrts: \
-    configure-target-libcilkrts \
-    pdf-target-libcilkrts 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-.PHONY: maybe-install-html-target-libcilkrts install-html-target-libcilkrts
-maybe-install-html-target-libcilkrts:
-@if target-libcilkrts
-maybe-install-html-target-libcilkrts: install-html-target-libcilkrts
-
-install-html-target-libcilkrts: \
-    configure-target-libcilkrts \
-    html-target-libcilkrts 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-.PHONY: maybe-installcheck-target-libcilkrts installcheck-target-libcilkrts
-maybe-installcheck-target-libcilkrts:
-@if target-libcilkrts
-maybe-installcheck-target-libcilkrts: installcheck-target-libcilkrts
-
-installcheck-target-libcilkrts: \
-    configure-target-libcilkrts 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-.PHONY: maybe-mostlyclean-target-libcilkrts mostlyclean-target-libcilkrts
-maybe-mostlyclean-target-libcilkrts:
-@if target-libcilkrts
-maybe-mostlyclean-target-libcilkrts: mostlyclean-target-libcilkrts
-
-mostlyclean-target-libcilkrts: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-.PHONY: maybe-clean-target-libcilkrts clean-target-libcilkrts
-maybe-clean-target-libcilkrts:
-@if target-libcilkrts
-maybe-clean-target-libcilkrts: clean-target-libcilkrts
-
-clean-target-libcilkrts: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-.PHONY: maybe-distclean-target-libcilkrts distclean-target-libcilkrts
-maybe-distclean-target-libcilkrts:
-@if target-libcilkrts
-maybe-distclean-target-libcilkrts: distclean-target-libcilkrts
-
-distclean-target-libcilkrts: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-.PHONY: maybe-maintainer-clean-target-libcilkrts maintainer-clean-target-libcilkrts
-maybe-maintainer-clean-target-libcilkrts:
-@if target-libcilkrts
-maybe-maintainer-clean-target-libcilkrts: maintainer-clean-target-libcilkrts
-
-maintainer-clean-target-libcilkrts: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libcilkrts && \
-         $(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-libcilkrts
-
-
-
-
-
 .PHONY: configure-target-liboffloadmic maybe-configure-target-liboffloadmic
 maybe-configure-target-liboffloadmic:
 @if gcc-bootstrap
@@ -48681,6 +49702,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
@@ -53969,6 +55448,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
@@ -54020,7 +55503,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:
@@ -54062,6 +55545,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.
@@ -54244,6 +55735,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)
@@ -54359,6 +55855,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
@@ -54539,6 +56040,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); \
@@ -54677,6 +56184,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); : ; \
@@ -54881,6 +56394,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); \
@@ -55019,6 +56538,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); : ; \
@@ -55064,7 +56589,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; \
@@ -55279,6 +56804,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); \
@@ -55417,6 +56948,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); : ; \
@@ -55462,7 +56999,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; \
@@ -55665,6 +57202,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); \
@@ -55803,6 +57346,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); : ; \
@@ -55984,6 +57533,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); \
@@ -56122,6 +57677,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); : ; \
@@ -56303,6 +57864,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); \
@@ -56441,6 +58008,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); : ; \
@@ -56645,6 +58218,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); \
@@ -56783,6 +58362,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); : ; \
@@ -56964,6 +58549,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); \
@@ -57102,6 +58693,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); : ; \
@@ -57174,8 +58771,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); }; \
@@ -57227,15 +58824,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
@@ -57245,7 +58833,6 @@ configure-stagetrain-target-libvtv: maybe-all-stagetrain-gcc
 configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-gcc
 configure-stageautoprofile-target-libvtv: maybe-all-stageautoprofile-gcc
 configure-stageautofeedback-target-libvtv: maybe-all-stageautofeedback-gcc
-configure-target-libcilkrts: stage_last
 configure-target-liboffloadmic: stage_last
 configure-target-libssp: stage_last
 configure-target-newlib: stage_last
@@ -57264,6 +58851,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
@@ -57287,9 +58875,7 @@ 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-libcilkrts: maybe-all-gcc
 configure-target-liboffloadmic: maybe-all-gcc
 configure-target-libssp: maybe-all-gcc
 configure-target-newlib: maybe-all-gcc
@@ -57300,6 +58886,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
@@ -57339,7 +58926,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
@@ -57350,7 +58936,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
@@ -57361,7 +58946,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
@@ -57372,7 +58956,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
@@ -57383,7 +58966,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
@@ -57394,7 +58976,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
@@ -57405,7 +58986,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
@@ -57416,7 +58996,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
@@ -57427,7 +59006,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
@@ -57438,7 +59016,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
@@ -57449,7 +59026,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
@@ -57460,7 +59036,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
@@ -57471,7 +59046,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
@@ -57482,7 +59056,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
@@ -57493,7 +59066,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
@@ -57504,7 +59076,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
@@ -57515,7 +59086,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
@@ -57526,7 +59096,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
@@ -57537,7 +59106,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
@@ -57548,7 +59116,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
@@ -57559,7 +59126,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
@@ -57570,7 +59136,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
@@ -57581,7 +59146,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
@@ -57592,7 +59156,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
@@ -57603,7 +59166,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
@@ -57614,7 +59176,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
@@ -57625,7 +59186,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
@@ -57636,7 +59196,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
@@ -57647,7 +59206,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
@@ -57658,7 +59216,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
@@ -57669,7 +59226,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
@@ -57680,7 +59236,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
@@ -57691,7 +59246,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
@@ -57702,7 +59256,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
@@ -57713,7 +59266,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
@@ -57728,7 +59280,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
@@ -57739,7 +59290,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
@@ -57750,7 +59300,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
@@ -57761,7 +59310,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
@@ -57772,7 +59320,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
@@ -57783,7 +59330,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
@@ -57794,7 +59340,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
@@ -57805,9 +59350,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
@@ -57818,7 +59361,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
@@ -57828,12 +59370,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
@@ -57844,7 +59382,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
@@ -57855,7 +59392,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
@@ -57866,7 +59402,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
@@ -57877,7 +59412,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
@@ -57887,25 +59421,26 @@ 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
+configure-gdb: maybe-all-gdbsupport
+all-gdb: maybe-all-gnulib
+all-gdb: maybe-all-gdbsupport
 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-gdbserver: maybe-all-gnulib
+all-gdbserver: maybe-all-gdbsupport
+all-gdbserver: maybe-all-gnulib
 configure-libgui: maybe-configure-tcl
 configure-libgui: maybe-configure-tk
 all-libgui: maybe-all-tcl
 all-libgui: maybe-all-tk
 all-libgui: maybe-all-itcl
+configure-gdbsupport: maybe-configure-gnulib
+all-gdbsupport: maybe-all-gnulib
 configure-bfd: configure-libiberty
-
 configure-stage1-bfd: configure-stage1-libiberty
 configure-stage2-bfd: configure-stage2-libiberty
 configure-stage3-bfd: configure-stage3-libiberty
@@ -57916,7 +59451,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
@@ -57927,7 +59461,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
@@ -57938,7 +59471,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
@@ -57949,7 +59481,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
@@ -57960,7 +59491,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
@@ -57971,7 +59501,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
@@ -57982,7 +59511,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
@@ -57993,7 +59521,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
@@ -58004,7 +59531,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
@@ -58015,7 +59541,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
@@ -58026,7 +59551,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
@@ -58037,7 +59561,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
@@ -58048,7 +59571,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
@@ -58059,7 +59581,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
@@ -58069,12 +59590,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
@@ -58085,7 +59615,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
@@ -58096,7 +59625,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
@@ -58107,7 +59635,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
@@ -58118,7 +59645,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
@@ -58128,14 +59654,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
@@ -58146,7 +59665,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
@@ -58157,7 +59675,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
@@ -58168,7 +59685,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
@@ -58179,7 +59695,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
@@ -58190,7 +59705,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
@@ -58201,7 +59715,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
@@ -58212,7 +59725,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
@@ -58223,7 +59735,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
@@ -58236,7 +59747,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
@@ -58247,7 +59757,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
@@ -58258,7 +59767,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
@@ -58269,7 +59777,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
@@ -58280,7 +59787,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
@@ -58291,7 +59797,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
@@ -58302,7 +59807,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
@@ -58313,7 +59817,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
@@ -58324,7 +59827,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
@@ -58335,7 +59837,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
@@ -58346,7 +59847,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
@@ -58357,7 +59857,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
@@ -58382,42 +59881,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
@@ -58427,9 +59986,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
@@ -58440,7 +59997,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
@@ -58451,7 +60007,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
@@ -58461,16 +60016,14 @@ 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
 install-target-libvtv: maybe-install-target-libgcc
-install-target-libcilkrts: maybe-install-target-libstdc++-v3
-install-target-libcilkrts: maybe-install-target-libgcc
 install-target-liboffloadmic: maybe-install-target-libstdc++-v3
 install-target-liboffloadmic: maybe-install-target-libgcc
 install-target-libitm: maybe-install-target-libgcc
@@ -58478,12 +60031,68 @@ 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-gdbserver: stage_last
+configure-gdbsupport: 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
+all-gdb: maybe-all-libctf
+all-gdbserver: maybe-all-libiberty
+configure-gdbsupport: maybe-configure-intl
+all-gdbsupport: maybe-all-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
+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.
@@ -58508,15 +60117,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
@@ -58540,9 +60140,7 @@ 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-libcilkrts: maybe-all-target-libgcc
 configure-target-liboffloadmic: maybe-all-target-libgcc
 configure-target-libssp: maybe-all-target-libgcc
 configure-target-newlib: maybe-all-target-libgcc
@@ -58552,6 +60150,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
@@ -58569,13 +60168,8 @@ 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-libcilkrts: maybe-all-target-newlib maybe-all-target-libgloss
-configure-target-libcilkrts: maybe-all-target-libstdc++-v3
-
 configure-target-liboffloadmic: maybe-all-target-newlib maybe-all-target-libgloss
 configure-target-liboffloadmic: maybe-all-target-libstdc++-v3
 
@@ -58595,6 +60189,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