ChangeLog: Fix whitespace.
[gcc.git] / Makefile.in
index a9b8a0ec3a2f132b448dad3213471fdbf9855695..329af7fb6f48eed3311c4eced3bf64a7b3d7eb74 100644 (file)
@@ -166,7 +166,7 @@ BUILD_EXPORTS = \
        WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
 
 # These variables must be set on the make command line for directories
-# built for the build system to override those in BASE_FLAGS_TO_PASSS.
+# built for the build system to override those in BASE_FLAGS_TO_PASS.
 EXTRA_BUILD_FLAGS = \
        CFLAGS="$(CFLAGS_FOR_BUILD)" \
        LDFLAGS="$(LDFLAGS_FOR_BUILD)"
@@ -235,13 +235,13 @@ POSTSTAGE1_CXX_EXPORT = \
 @if target-libstdc++-v3-bootstrap
 # Override the above if we're bootstrapping C++.
 POSTSTAGE1_CXX_EXPORT = \
-       CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/g++$(exeext) \
+       CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xg++$(exeext) \
          -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
          -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
          -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
-         -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
-         -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
-         -I$$s/libstdc++-v3/libsupc++ \
+         `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
+         `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
+         `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$s/libstdc++-v3/libsupc++ \
          -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
          -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs"; \
          export CXX; \
@@ -364,7 +364,7 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 # here so that they can be overridden by Makefile fragments.
 BOOT_CFLAGS= -g -O2
 BOOT_LDFLAGS=
-BOOT_ADAFLAGS=-gnatpg -gnata
+BOOT_ADAFLAGS= -gnatpg
 
 AWK = @AWK@
 SED = @SED@
@@ -420,7 +420,6 @@ TFLAGS =
 STAGE_CFLAGS = $(BOOT_CFLAGS)
 STAGE_TFLAGS = $(TFLAGS)
 STAGE_CONFIGURE_FLAGS=@stage2_werror_flag@
-POSTSTAGE1_CONFIGURE_FLAGS = @POSTSTAGE1_CONFIGURE_FLAGS@
 
 
 # Defaults for stage 1; some are overridden below.
@@ -431,10 +430,7 @@ STAGE1_CXXFLAGS = $(CXXFLAGS)
 STAGE1_CXXFLAGS = $(STAGE1_CFLAGS)
 @endif target-libstdc++-v3-bootstrap
 STAGE1_TFLAGS = $(STAGE_TFLAGS)
-# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
-# POSTSTAGE1_CONFIGURE_FLAGS here.
-STAGE1_CONFIGURE_FLAGS = \
-       $(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+STAGE1_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 # Defaults for stage 2; some are overridden below.
 STAGE2_CFLAGS = $(STAGE_CFLAGS)
@@ -444,10 +440,7 @@ STAGE2_CXXFLAGS = $(CXXFLAGS)
 STAGE2_CXXFLAGS = $(STAGE2_CFLAGS)
 @endif target-libstdc++-v3-bootstrap
 STAGE2_TFLAGS = $(STAGE_TFLAGS)
-# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
-# POSTSTAGE1_CONFIGURE_FLAGS here.
-STAGE2_CONFIGURE_FLAGS = \
-       $(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+STAGE2_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 # Defaults for stage 3; some are overridden below.
 STAGE3_CFLAGS = $(STAGE_CFLAGS)
@@ -457,10 +450,7 @@ STAGE3_CXXFLAGS = $(CXXFLAGS)
 STAGE3_CXXFLAGS = $(STAGE3_CFLAGS)
 @endif target-libstdc++-v3-bootstrap
 STAGE3_TFLAGS = $(STAGE_TFLAGS)
-# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
-# POSTSTAGE1_CONFIGURE_FLAGS here.
-STAGE3_CONFIGURE_FLAGS = \
-       $(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+STAGE3_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 # Defaults for stage 4; some are overridden below.
 STAGE4_CFLAGS = $(STAGE_CFLAGS)
@@ -470,10 +460,7 @@ STAGE4_CXXFLAGS = $(CXXFLAGS)
 STAGE4_CXXFLAGS = $(STAGE4_CFLAGS)
 @endif target-libstdc++-v3-bootstrap
 STAGE4_TFLAGS = $(STAGE_TFLAGS)
-# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
-# POSTSTAGE1_CONFIGURE_FLAGS here.
-STAGE4_CONFIGURE_FLAGS = \
-       $(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+STAGE4_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 # Defaults for stage profile; some are overridden below.
 STAGEprofile_CFLAGS = $(STAGE_CFLAGS)
@@ -483,10 +470,7 @@ STAGEprofile_CXXFLAGS = $(CXXFLAGS)
 STAGEprofile_CXXFLAGS = $(STAGEprofile_CFLAGS)
 @endif target-libstdc++-v3-bootstrap
 STAGEprofile_TFLAGS = $(STAGE_TFLAGS)
-# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
-# POSTSTAGE1_CONFIGURE_FLAGS here.
-STAGEprofile_CONFIGURE_FLAGS = \
-       $(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+STAGEprofile_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 # Defaults for stage feedback; some are overridden below.
 STAGEfeedback_CFLAGS = $(STAGE_CFLAGS)
@@ -496,10 +480,7 @@ STAGEfeedback_CXXFLAGS = $(CXXFLAGS)
 STAGEfeedback_CXXFLAGS = $(STAGEfeedback_CFLAGS)
 @endif target-libstdc++-v3-bootstrap
 STAGEfeedback_TFLAGS = $(STAGE_TFLAGS)
-# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
-# POSTSTAGE1_CONFIGURE_FLAGS here.
-STAGEfeedback_CONFIGURE_FLAGS = \
-       $(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+STAGEfeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 
 # Only build the C compiler for stage1, because that is the only one that
@@ -517,11 +498,10 @@ STAGE1_LANGUAGES = @stage1_languages@
 #   the last argument when conflicting --enable arguments are passed.
 # * Likewise, we force-disable coverage flags, since the installed
 #   compiler probably has never heard of them.
-# * Don't remove this, because above we added
-#   POSTSTAGE1_CONFIGURE_FLAGS to STAGE_CONFIGURE_FLAGS, which
-#   we don't want for STAGE1_CONFIGURE_FLAGS.
+# * We also disable -Wformat, since older GCCs don't understand newer %s.
 STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
-         --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
+         --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" \
+         --disable-build-format-warnings
 
 STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
 STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
@@ -597,15 +577,23 @@ 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_libmudflap)$(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_libcilkrts)$(TARGET_LIB_PATH_libssp)$(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:
 @endif target-libstdc++-v3
 
-@if target-libmudflap
-TARGET_LIB_PATH_libmudflap = $$r/$(TARGET_SUBDIR)/libmudflap/.libs:
-@endif target-libmudflap
+@if target-libsanitizer
+TARGET_LIB_PATH_libsanitizer = $$r/$(TARGET_SUBDIR)/libsanitizer/.libs:
+@endif target-libsanitizer
+
+@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-libssp
 TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
@@ -627,7 +615,7 @@ TARGET_LIB_PATH_libatomic = $$r/$(TARGET_SUBDIR)/libatomic/.libs:
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that programs built for the host machine work.
-HOST_LIB_PATH = $(HOST_LIB_PATH_bfd)$(HOST_LIB_PATH_opcodes)$(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)$(HOST_LIB_PATH_cloog)$(HOST_LIB_PATH_libelf)
+HOST_LIB_PATH = $(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)$(HOST_LIB_PATH_cloog)$(HOST_LIB_PATH_libelf)
 
 # Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch
 @if gcc
@@ -635,16 +623,6 @@ HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc$(GCC_SHLIB_SUBDIR):$$r/$(HOST_SUBDIR)
 @endif gcc
 
 
-@if bfd
-HOST_LIB_PATH_bfd = \
-  $$r/$(HOST_SUBDIR)/bfd/.libs:$$r/$(HOST_SUBDIR)/prev-bfd/.libs:
-@endif bfd
-
-@if opcodes
-HOST_LIB_PATH_opcodes = \
-  $$r/$(HOST_SUBDIR)/opcodes/.libs:$$r/$(HOST_SUBDIR)/prev-opcodes/.libs:
-@endif opcodes
-
 @if gmp
 HOST_LIB_PATH_gmp = \
   $$r/$(HOST_SUBDIR)/gmp/.libs:$$r/$(HOST_SUBDIR)/prev-gmp/.libs:
@@ -834,6 +812,12 @@ EXTRA_HOST_FLAGS = \
 
 FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
 
+# Flags to pass to stage1 or when not bootstrapping.
+
+STAGE1_FLAGS_TO_PASS = \
+       LDFLAGS="$${LDFLAGS}" \
+       HOST_LIBS="$${HOST_LIBS}"
+
 # Flags to pass to stage2 and later makes.
 
 POSTSTAGE1_FLAGS_TO_PASS = \
@@ -922,10 +906,12 @@ configure-host:  \
     maybe-configure-tcl \
     maybe-configure-itcl \
     maybe-configure-ld \
+    maybe-configure-libbacktrace \
     maybe-configure-libcpp \
     maybe-configure-libdecnumber \
     maybe-configure-libgui \
     maybe-configure-libiberty \
+    maybe-configure-libiberty-linker-plugin \
     maybe-configure-libiconv \
     maybe-configure-m4 \
     maybe-configure-readline \
@@ -944,10 +930,13 @@ configure-host:  \
 .PHONY: configure-target
 configure-target:  \
     maybe-configure-target-libstdc++-v3 \
-    maybe-configure-target-libmudflap \
+    maybe-configure-target-libsanitizer \
+    maybe-configure-target-libvtv \
+    maybe-configure-target-libcilkrts \
     maybe-configure-target-libssp \
     maybe-configure-target-newlib \
     maybe-configure-target-libgcc \
+    maybe-configure-target-libbacktrace \
     maybe-configure-target-libquadmath \
     maybe-configure-target-libgfortran \
     maybe-configure-target-libobjc \
@@ -1015,7 +1004,9 @@ all-host: maybe-all-cgen
 all-host: maybe-all-dejagnu
 all-host: maybe-all-etc
 all-host: maybe-all-fastjar
+@if fixincludes-no-bootstrap
 all-host: maybe-all-fixincludes
+@endif fixincludes-no-bootstrap
 all-host: maybe-all-flex
 @if gas-no-bootstrap
 all-host: maybe-all-gas
@@ -1053,6 +1044,9 @@ all-host: maybe-all-itcl
 @if ld-no-bootstrap
 all-host: maybe-all-ld
 @endif ld-no-bootstrap
+@if libbacktrace-no-bootstrap
+all-host: maybe-all-libbacktrace
+@endif libbacktrace-no-bootstrap
 @if libcpp-no-bootstrap
 all-host: maybe-all-libcpp
 @endif libcpp-no-bootstrap
@@ -1063,6 +1057,9 @@ all-host: maybe-all-libgui
 @if libiberty-no-bootstrap
 all-host: maybe-all-libiberty
 @endif libiberty-no-bootstrap
+@if libiberty-linker-plugin-no-bootstrap
+all-host: maybe-all-libiberty-linker-plugin
+@endif libiberty-linker-plugin-no-bootstrap
 all-host: maybe-all-libiconv
 all-host: maybe-all-m4
 all-host: maybe-all-readline
@@ -1088,12 +1085,19 @@ all-host: maybe-all-lto-plugin
 @if target-libstdc++-v3-no-bootstrap
 all-target: maybe-all-target-libstdc++-v3
 @endif target-libstdc++-v3-no-bootstrap
-all-target: maybe-all-target-libmudflap
+@if target-libsanitizer-no-bootstrap
+all-target: maybe-all-target-libsanitizer
+@endif target-libsanitizer-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-libssp
 all-target: maybe-all-target-newlib
 @if target-libgcc-no-bootstrap
 all-target: maybe-all-target-libgcc
 @endif target-libgcc-no-bootstrap
+all-target: maybe-all-target-libbacktrace
 all-target: maybe-all-target-libquadmath
 all-target: maybe-all-target-libgfortran
 all-target: maybe-all-target-libobjc
@@ -1153,10 +1157,12 @@ info-host: maybe-info-intl
 info-host: maybe-info-tcl
 info-host: maybe-info-itcl
 info-host: maybe-info-ld
+info-host: maybe-info-libbacktrace
 info-host: maybe-info-libcpp
 info-host: maybe-info-libdecnumber
 info-host: maybe-info-libgui
 info-host: maybe-info-libiberty
+info-host: maybe-info-libiberty-linker-plugin
 info-host: maybe-info-libiconv
 info-host: maybe-info-m4
 info-host: maybe-info-readline
@@ -1176,10 +1182,13 @@ info-host: maybe-info-lto-plugin
 .PHONY: info-target
 
 info-target: maybe-info-target-libstdc++-v3
-info-target: maybe-info-target-libmudflap
+info-target: maybe-info-target-libsanitizer
+info-target: maybe-info-target-libvtv
+info-target: maybe-info-target-libcilkrts
 info-target: maybe-info-target-libssp
 info-target: maybe-info-target-newlib
 info-target: maybe-info-target-libgcc
+info-target: maybe-info-target-libbacktrace
 info-target: maybe-info-target-libquadmath
 info-target: maybe-info-target-libgfortran
 info-target: maybe-info-target-libobjc
@@ -1232,10 +1241,12 @@ dvi-host: maybe-dvi-intl
 dvi-host: maybe-dvi-tcl
 dvi-host: maybe-dvi-itcl
 dvi-host: maybe-dvi-ld
+dvi-host: maybe-dvi-libbacktrace
 dvi-host: maybe-dvi-libcpp
 dvi-host: maybe-dvi-libdecnumber
 dvi-host: maybe-dvi-libgui
 dvi-host: maybe-dvi-libiberty
+dvi-host: maybe-dvi-libiberty-linker-plugin
 dvi-host: maybe-dvi-libiconv
 dvi-host: maybe-dvi-m4
 dvi-host: maybe-dvi-readline
@@ -1255,10 +1266,13 @@ dvi-host: maybe-dvi-lto-plugin
 .PHONY: dvi-target
 
 dvi-target: maybe-dvi-target-libstdc++-v3
-dvi-target: maybe-dvi-target-libmudflap
+dvi-target: maybe-dvi-target-libsanitizer
+dvi-target: maybe-dvi-target-libvtv
+dvi-target: maybe-dvi-target-libcilkrts
 dvi-target: maybe-dvi-target-libssp
 dvi-target: maybe-dvi-target-newlib
 dvi-target: maybe-dvi-target-libgcc
+dvi-target: maybe-dvi-target-libbacktrace
 dvi-target: maybe-dvi-target-libquadmath
 dvi-target: maybe-dvi-target-libgfortran
 dvi-target: maybe-dvi-target-libobjc
@@ -1311,10 +1325,12 @@ pdf-host: maybe-pdf-intl
 pdf-host: maybe-pdf-tcl
 pdf-host: maybe-pdf-itcl
 pdf-host: maybe-pdf-ld
+pdf-host: maybe-pdf-libbacktrace
 pdf-host: maybe-pdf-libcpp
 pdf-host: maybe-pdf-libdecnumber
 pdf-host: maybe-pdf-libgui
 pdf-host: maybe-pdf-libiberty
+pdf-host: maybe-pdf-libiberty-linker-plugin
 pdf-host: maybe-pdf-libiconv
 pdf-host: maybe-pdf-m4
 pdf-host: maybe-pdf-readline
@@ -1334,10 +1350,13 @@ pdf-host: maybe-pdf-lto-plugin
 .PHONY: pdf-target
 
 pdf-target: maybe-pdf-target-libstdc++-v3
-pdf-target: maybe-pdf-target-libmudflap
+pdf-target: maybe-pdf-target-libsanitizer
+pdf-target: maybe-pdf-target-libvtv
+pdf-target: maybe-pdf-target-libcilkrts
 pdf-target: maybe-pdf-target-libssp
 pdf-target: maybe-pdf-target-newlib
 pdf-target: maybe-pdf-target-libgcc
+pdf-target: maybe-pdf-target-libbacktrace
 pdf-target: maybe-pdf-target-libquadmath
 pdf-target: maybe-pdf-target-libgfortran
 pdf-target: maybe-pdf-target-libobjc
@@ -1390,10 +1409,12 @@ html-host: maybe-html-intl
 html-host: maybe-html-tcl
 html-host: maybe-html-itcl
 html-host: maybe-html-ld
+html-host: maybe-html-libbacktrace
 html-host: maybe-html-libcpp
 html-host: maybe-html-libdecnumber
 html-host: maybe-html-libgui
 html-host: maybe-html-libiberty
+html-host: maybe-html-libiberty-linker-plugin
 html-host: maybe-html-libiconv
 html-host: maybe-html-m4
 html-host: maybe-html-readline
@@ -1413,10 +1434,13 @@ html-host: maybe-html-lto-plugin
 .PHONY: html-target
 
 html-target: maybe-html-target-libstdc++-v3
-html-target: maybe-html-target-libmudflap
+html-target: maybe-html-target-libsanitizer
+html-target: maybe-html-target-libvtv
+html-target: maybe-html-target-libcilkrts
 html-target: maybe-html-target-libssp
 html-target: maybe-html-target-newlib
 html-target: maybe-html-target-libgcc
+html-target: maybe-html-target-libbacktrace
 html-target: maybe-html-target-libquadmath
 html-target: maybe-html-target-libgfortran
 html-target: maybe-html-target-libobjc
@@ -1469,10 +1493,12 @@ TAGS-host: maybe-TAGS-intl
 TAGS-host: maybe-TAGS-tcl
 TAGS-host: maybe-TAGS-itcl
 TAGS-host: maybe-TAGS-ld
+TAGS-host: maybe-TAGS-libbacktrace
 TAGS-host: maybe-TAGS-libcpp
 TAGS-host: maybe-TAGS-libdecnumber
 TAGS-host: maybe-TAGS-libgui
 TAGS-host: maybe-TAGS-libiberty
+TAGS-host: maybe-TAGS-libiberty-linker-plugin
 TAGS-host: maybe-TAGS-libiconv
 TAGS-host: maybe-TAGS-m4
 TAGS-host: maybe-TAGS-readline
@@ -1492,10 +1518,13 @@ TAGS-host: maybe-TAGS-lto-plugin
 .PHONY: TAGS-target
 
 TAGS-target: maybe-TAGS-target-libstdc++-v3
-TAGS-target: maybe-TAGS-target-libmudflap
+TAGS-target: maybe-TAGS-target-libsanitizer
+TAGS-target: maybe-TAGS-target-libvtv
+TAGS-target: maybe-TAGS-target-libcilkrts
 TAGS-target: maybe-TAGS-target-libssp
 TAGS-target: maybe-TAGS-target-newlib
 TAGS-target: maybe-TAGS-target-libgcc
+TAGS-target: maybe-TAGS-target-libbacktrace
 TAGS-target: maybe-TAGS-target-libquadmath
 TAGS-target: maybe-TAGS-target-libgfortran
 TAGS-target: maybe-TAGS-target-libobjc
@@ -1548,10 +1577,12 @@ install-info-host: maybe-install-info-intl
 install-info-host: maybe-install-info-tcl
 install-info-host: maybe-install-info-itcl
 install-info-host: maybe-install-info-ld
+install-info-host: maybe-install-info-libbacktrace
 install-info-host: maybe-install-info-libcpp
 install-info-host: maybe-install-info-libdecnumber
 install-info-host: maybe-install-info-libgui
 install-info-host: maybe-install-info-libiberty
+install-info-host: maybe-install-info-libiberty-linker-plugin
 install-info-host: maybe-install-info-libiconv
 install-info-host: maybe-install-info-m4
 install-info-host: maybe-install-info-readline
@@ -1571,10 +1602,13 @@ install-info-host: maybe-install-info-lto-plugin
 .PHONY: install-info-target
 
 install-info-target: maybe-install-info-target-libstdc++-v3
-install-info-target: maybe-install-info-target-libmudflap
+install-info-target: maybe-install-info-target-libsanitizer
+install-info-target: maybe-install-info-target-libvtv
+install-info-target: maybe-install-info-target-libcilkrts
 install-info-target: maybe-install-info-target-libssp
 install-info-target: maybe-install-info-target-newlib
 install-info-target: maybe-install-info-target-libgcc
+install-info-target: maybe-install-info-target-libbacktrace
 install-info-target: maybe-install-info-target-libquadmath
 install-info-target: maybe-install-info-target-libgfortran
 install-info-target: maybe-install-info-target-libobjc
@@ -1627,10 +1661,12 @@ install-pdf-host: maybe-install-pdf-intl
 install-pdf-host: maybe-install-pdf-tcl
 install-pdf-host: maybe-install-pdf-itcl
 install-pdf-host: maybe-install-pdf-ld
+install-pdf-host: maybe-install-pdf-libbacktrace
 install-pdf-host: maybe-install-pdf-libcpp
 install-pdf-host: maybe-install-pdf-libdecnumber
 install-pdf-host: maybe-install-pdf-libgui
 install-pdf-host: maybe-install-pdf-libiberty
+install-pdf-host: maybe-install-pdf-libiberty-linker-plugin
 install-pdf-host: maybe-install-pdf-libiconv
 install-pdf-host: maybe-install-pdf-m4
 install-pdf-host: maybe-install-pdf-readline
@@ -1650,10 +1686,13 @@ install-pdf-host: maybe-install-pdf-lto-plugin
 .PHONY: install-pdf-target
 
 install-pdf-target: maybe-install-pdf-target-libstdc++-v3
-install-pdf-target: maybe-install-pdf-target-libmudflap
+install-pdf-target: maybe-install-pdf-target-libsanitizer
+install-pdf-target: maybe-install-pdf-target-libvtv
+install-pdf-target: maybe-install-pdf-target-libcilkrts
 install-pdf-target: maybe-install-pdf-target-libssp
 install-pdf-target: maybe-install-pdf-target-newlib
 install-pdf-target: maybe-install-pdf-target-libgcc
+install-pdf-target: maybe-install-pdf-target-libbacktrace
 install-pdf-target: maybe-install-pdf-target-libquadmath
 install-pdf-target: maybe-install-pdf-target-libgfortran
 install-pdf-target: maybe-install-pdf-target-libobjc
@@ -1706,10 +1745,12 @@ install-html-host: maybe-install-html-intl
 install-html-host: maybe-install-html-tcl
 install-html-host: maybe-install-html-itcl
 install-html-host: maybe-install-html-ld
+install-html-host: maybe-install-html-libbacktrace
 install-html-host: maybe-install-html-libcpp
 install-html-host: maybe-install-html-libdecnumber
 install-html-host: maybe-install-html-libgui
 install-html-host: maybe-install-html-libiberty
+install-html-host: maybe-install-html-libiberty-linker-plugin
 install-html-host: maybe-install-html-libiconv
 install-html-host: maybe-install-html-m4
 install-html-host: maybe-install-html-readline
@@ -1729,10 +1770,13 @@ install-html-host: maybe-install-html-lto-plugin
 .PHONY: install-html-target
 
 install-html-target: maybe-install-html-target-libstdc++-v3
-install-html-target: maybe-install-html-target-libmudflap
+install-html-target: maybe-install-html-target-libsanitizer
+install-html-target: maybe-install-html-target-libvtv
+install-html-target: maybe-install-html-target-libcilkrts
 install-html-target: maybe-install-html-target-libssp
 install-html-target: maybe-install-html-target-newlib
 install-html-target: maybe-install-html-target-libgcc
+install-html-target: maybe-install-html-target-libbacktrace
 install-html-target: maybe-install-html-target-libquadmath
 install-html-target: maybe-install-html-target-libgfortran
 install-html-target: maybe-install-html-target-libobjc
@@ -1785,10 +1829,12 @@ installcheck-host: maybe-installcheck-intl
 installcheck-host: maybe-installcheck-tcl
 installcheck-host: maybe-installcheck-itcl
 installcheck-host: maybe-installcheck-ld
+installcheck-host: maybe-installcheck-libbacktrace
 installcheck-host: maybe-installcheck-libcpp
 installcheck-host: maybe-installcheck-libdecnumber
 installcheck-host: maybe-installcheck-libgui
 installcheck-host: maybe-installcheck-libiberty
+installcheck-host: maybe-installcheck-libiberty-linker-plugin
 installcheck-host: maybe-installcheck-libiconv
 installcheck-host: maybe-installcheck-m4
 installcheck-host: maybe-installcheck-readline
@@ -1808,10 +1854,13 @@ installcheck-host: maybe-installcheck-lto-plugin
 .PHONY: installcheck-target
 
 installcheck-target: maybe-installcheck-target-libstdc++-v3
-installcheck-target: maybe-installcheck-target-libmudflap
+installcheck-target: maybe-installcheck-target-libsanitizer
+installcheck-target: maybe-installcheck-target-libvtv
+installcheck-target: maybe-installcheck-target-libcilkrts
 installcheck-target: maybe-installcheck-target-libssp
 installcheck-target: maybe-installcheck-target-newlib
 installcheck-target: maybe-installcheck-target-libgcc
+installcheck-target: maybe-installcheck-target-libbacktrace
 installcheck-target: maybe-installcheck-target-libquadmath
 installcheck-target: maybe-installcheck-target-libgfortran
 installcheck-target: maybe-installcheck-target-libobjc
@@ -1864,10 +1913,12 @@ mostlyclean-host: maybe-mostlyclean-intl
 mostlyclean-host: maybe-mostlyclean-tcl
 mostlyclean-host: maybe-mostlyclean-itcl
 mostlyclean-host: maybe-mostlyclean-ld
+mostlyclean-host: maybe-mostlyclean-libbacktrace
 mostlyclean-host: maybe-mostlyclean-libcpp
 mostlyclean-host: maybe-mostlyclean-libdecnumber
 mostlyclean-host: maybe-mostlyclean-libgui
 mostlyclean-host: maybe-mostlyclean-libiberty
+mostlyclean-host: maybe-mostlyclean-libiberty-linker-plugin
 mostlyclean-host: maybe-mostlyclean-libiconv
 mostlyclean-host: maybe-mostlyclean-m4
 mostlyclean-host: maybe-mostlyclean-readline
@@ -1887,10 +1938,13 @@ mostlyclean-host: maybe-mostlyclean-lto-plugin
 .PHONY: mostlyclean-target
 
 mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3
-mostlyclean-target: maybe-mostlyclean-target-libmudflap
+mostlyclean-target: maybe-mostlyclean-target-libsanitizer
+mostlyclean-target: maybe-mostlyclean-target-libvtv
+mostlyclean-target: maybe-mostlyclean-target-libcilkrts
 mostlyclean-target: maybe-mostlyclean-target-libssp
 mostlyclean-target: maybe-mostlyclean-target-newlib
 mostlyclean-target: maybe-mostlyclean-target-libgcc
+mostlyclean-target: maybe-mostlyclean-target-libbacktrace
 mostlyclean-target: maybe-mostlyclean-target-libquadmath
 mostlyclean-target: maybe-mostlyclean-target-libgfortran
 mostlyclean-target: maybe-mostlyclean-target-libobjc
@@ -1943,10 +1997,12 @@ clean-host: maybe-clean-intl
 clean-host: maybe-clean-tcl
 clean-host: maybe-clean-itcl
 clean-host: maybe-clean-ld
+clean-host: maybe-clean-libbacktrace
 clean-host: maybe-clean-libcpp
 clean-host: maybe-clean-libdecnumber
 clean-host: maybe-clean-libgui
 clean-host: maybe-clean-libiberty
+clean-host: maybe-clean-libiberty-linker-plugin
 clean-host: maybe-clean-libiconv
 clean-host: maybe-clean-m4
 clean-host: maybe-clean-readline
@@ -1966,10 +2022,13 @@ clean-host: maybe-clean-lto-plugin
 .PHONY: clean-target
 
 clean-target: maybe-clean-target-libstdc++-v3
-clean-target: maybe-clean-target-libmudflap
+clean-target: maybe-clean-target-libsanitizer
+clean-target: maybe-clean-target-libvtv
+clean-target: maybe-clean-target-libcilkrts
 clean-target: maybe-clean-target-libssp
 clean-target: maybe-clean-target-newlib
 clean-target: maybe-clean-target-libgcc
+clean-target: maybe-clean-target-libbacktrace
 clean-target: maybe-clean-target-libquadmath
 clean-target: maybe-clean-target-libgfortran
 clean-target: maybe-clean-target-libobjc
@@ -2022,10 +2081,12 @@ distclean-host: maybe-distclean-intl
 distclean-host: maybe-distclean-tcl
 distclean-host: maybe-distclean-itcl
 distclean-host: maybe-distclean-ld
+distclean-host: maybe-distclean-libbacktrace
 distclean-host: maybe-distclean-libcpp
 distclean-host: maybe-distclean-libdecnumber
 distclean-host: maybe-distclean-libgui
 distclean-host: maybe-distclean-libiberty
+distclean-host: maybe-distclean-libiberty-linker-plugin
 distclean-host: maybe-distclean-libiconv
 distclean-host: maybe-distclean-m4
 distclean-host: maybe-distclean-readline
@@ -2045,10 +2106,13 @@ distclean-host: maybe-distclean-lto-plugin
 .PHONY: distclean-target
 
 distclean-target: maybe-distclean-target-libstdc++-v3
-distclean-target: maybe-distclean-target-libmudflap
+distclean-target: maybe-distclean-target-libsanitizer
+distclean-target: maybe-distclean-target-libvtv
+distclean-target: maybe-distclean-target-libcilkrts
 distclean-target: maybe-distclean-target-libssp
 distclean-target: maybe-distclean-target-newlib
 distclean-target: maybe-distclean-target-libgcc
+distclean-target: maybe-distclean-target-libbacktrace
 distclean-target: maybe-distclean-target-libquadmath
 distclean-target: maybe-distclean-target-libgfortran
 distclean-target: maybe-distclean-target-libobjc
@@ -2101,10 +2165,12 @@ maintainer-clean-host: maybe-maintainer-clean-intl
 maintainer-clean-host: maybe-maintainer-clean-tcl
 maintainer-clean-host: maybe-maintainer-clean-itcl
 maintainer-clean-host: maybe-maintainer-clean-ld
+maintainer-clean-host: maybe-maintainer-clean-libbacktrace
 maintainer-clean-host: maybe-maintainer-clean-libcpp
 maintainer-clean-host: maybe-maintainer-clean-libdecnumber
 maintainer-clean-host: maybe-maintainer-clean-libgui
 maintainer-clean-host: maybe-maintainer-clean-libiberty
+maintainer-clean-host: maybe-maintainer-clean-libiberty-linker-plugin
 maintainer-clean-host: maybe-maintainer-clean-libiconv
 maintainer-clean-host: maybe-maintainer-clean-m4
 maintainer-clean-host: maybe-maintainer-clean-readline
@@ -2124,10 +2190,13 @@ maintainer-clean-host: maybe-maintainer-clean-lto-plugin
 .PHONY: maintainer-clean-target
 
 maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3
-maintainer-clean-target: maybe-maintainer-clean-target-libmudflap
+maintainer-clean-target: maybe-maintainer-clean-target-libsanitizer
+maintainer-clean-target: maybe-maintainer-clean-target-libvtv
+maintainer-clean-target: maybe-maintainer-clean-target-libcilkrts
 maintainer-clean-target: maybe-maintainer-clean-target-libssp
 maintainer-clean-target: maybe-maintainer-clean-target-newlib
 maintainer-clean-target: maybe-maintainer-clean-target-libgcc
+maintainer-clean-target: maybe-maintainer-clean-target-libbacktrace
 maintainer-clean-target: maybe-maintainer-clean-target-libquadmath
 maintainer-clean-target: maybe-maintainer-clean-target-libgfortran
 maintainer-clean-target: maybe-maintainer-clean-target-libobjc
@@ -2235,10 +2304,12 @@ check-host:  \
     maybe-check-tcl \
     maybe-check-itcl \
     maybe-check-ld \
+    maybe-check-libbacktrace \
     maybe-check-libcpp \
     maybe-check-libdecnumber \
     maybe-check-libgui \
     maybe-check-libiberty \
+    maybe-check-libiberty-linker-plugin \
     maybe-check-libiconv \
     maybe-check-m4 \
     maybe-check-readline \
@@ -2258,10 +2329,13 @@ check-host:  \
 .PHONY: check-target
 check-target:  \
     maybe-check-target-libstdc++-v3 \
-    maybe-check-target-libmudflap \
+    maybe-check-target-libsanitizer \
+    maybe-check-target-libvtv \
+    maybe-check-target-libcilkrts \
     maybe-check-target-libssp \
     maybe-check-target-newlib \
     maybe-check-target-libgcc \
+    maybe-check-target-libbacktrace \
     maybe-check-target-libquadmath \
     maybe-check-target-libgfortran \
     maybe-check-target-libobjc \
@@ -2340,10 +2414,12 @@ install-host-nogcc:  \
     maybe-install-tcl \
     maybe-install-itcl \
     maybe-install-ld \
+    maybe-install-libbacktrace \
     maybe-install-libcpp \
     maybe-install-libdecnumber \
     maybe-install-libgui \
     maybe-install-libiberty \
+    maybe-install-libiberty-linker-plugin \
     maybe-install-libiconv \
     maybe-install-m4 \
     maybe-install-readline \
@@ -2386,10 +2462,12 @@ install-host:  \
     maybe-install-tcl \
     maybe-install-itcl \
     maybe-install-ld \
+    maybe-install-libbacktrace \
     maybe-install-libcpp \
     maybe-install-libdecnumber \
     maybe-install-libgui \
     maybe-install-libiberty \
+    maybe-install-libiberty-linker-plugin \
     maybe-install-libiconv \
     maybe-install-m4 \
     maybe-install-readline \
@@ -2409,10 +2487,13 @@ install-host:  \
 .PHONY: install-target
 install-target:  \
     maybe-install-target-libstdc++-v3 \
-    maybe-install-target-libmudflap \
+    maybe-install-target-libsanitizer \
+    maybe-install-target-libvtv \
+    maybe-install-target-libcilkrts \
     maybe-install-target-libssp \
     maybe-install-target-newlib \
     maybe-install-target-libgcc \
+    maybe-install-target-libbacktrace \
     maybe-install-target-libquadmath \
     maybe-install-target-libgfortran \
     maybe-install-target-libobjc \
@@ -2485,10 +2566,12 @@ install-strip-host:  \
     maybe-install-strip-tcl \
     maybe-install-strip-itcl \
     maybe-install-strip-ld \
+    maybe-install-strip-libbacktrace \
     maybe-install-strip-libcpp \
     maybe-install-strip-libdecnumber \
     maybe-install-strip-libgui \
     maybe-install-strip-libiberty \
+    maybe-install-strip-libiberty-linker-plugin \
     maybe-install-strip-libiconv \
     maybe-install-strip-m4 \
     maybe-install-strip-readline \
@@ -2508,10 +2591,13 @@ install-strip-host:  \
 .PHONY: install-strip-target
 install-strip-target:  \
     maybe-install-strip-target-libstdc++-v3 \
-    maybe-install-strip-target-libmudflap \
+    maybe-install-strip-target-libsanitizer \
+    maybe-install-strip-target-libvtv \
+    maybe-install-strip-target-libcilkrts \
     maybe-install-strip-target-libssp \
     maybe-install-strip-target-newlib \
     maybe-install-strip-target-libgcc \
+    maybe-install-strip-target-libbacktrace \
     maybe-install-strip-target-libquadmath \
     maybe-install-strip-target-libgfortran \
     maybe-install-strip-target-libobjc \
@@ -2594,12 +2680,13 @@ configure-build-libiberty:
          *) topdir=`echo $(BUILD_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
+       module_srcdir=libiberty; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif build-libiberty
 
@@ -2621,7 +2708,7 @@ all-build-libiberty: configure-build-libiberty
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS)  \
        (cd $(BUILD_SUBDIR)/libiberty && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
                $(TARGET-build-libiberty))
 @endif build-libiberty
 
@@ -2650,12 +2737,13 @@ configure-build-bison:
          *) topdir=`echo $(BUILD_SUBDIR)/bison/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bison"; \
-       libsrcdir="$$s/bison"; \
+       module_srcdir=bison; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif build-bison
 
@@ -2677,7 +2765,7 @@ all-build-bison: configure-build-bison
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS)  \
        (cd $(BUILD_SUBDIR)/bison && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
                $(TARGET-build-bison))
 @endif build-bison
 
@@ -2706,12 +2794,13 @@ configure-build-flex:
          *) topdir=`echo $(BUILD_SUBDIR)/flex/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/flex"; \
-       libsrcdir="$$s/flex"; \
+       module_srcdir=flex; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif build-flex
 
@@ -2733,7 +2822,7 @@ all-build-flex: configure-build-flex
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS)  \
        (cd $(BUILD_SUBDIR)/flex && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
                $(TARGET-build-flex))
 @endif build-flex
 
@@ -2762,12 +2851,13 @@ configure-build-m4:
          *) topdir=`echo $(BUILD_SUBDIR)/m4/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/m4"; \
-       libsrcdir="$$s/m4"; \
+       module_srcdir=m4; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif build-m4
 
@@ -2789,7 +2879,7 @@ all-build-m4: configure-build-m4
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS)  \
        (cd $(BUILD_SUBDIR)/m4 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
                $(TARGET-build-m4))
 @endif build-m4
 
@@ -2818,12 +2908,13 @@ configure-build-texinfo:
          *) topdir=`echo $(BUILD_SUBDIR)/texinfo/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/texinfo"; \
-       libsrcdir="$$s/texinfo"; \
+       module_srcdir=texinfo; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif build-texinfo
 
@@ -2845,7 +2936,7 @@ all-build-texinfo: configure-build-texinfo
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS)  \
        (cd $(BUILD_SUBDIR)/texinfo && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
                $(TARGET-build-texinfo))
 @endif build-texinfo
 
@@ -2874,12 +2965,13 @@ configure-build-fixincludes:
          *) topdir=`echo $(BUILD_SUBDIR)/fixincludes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/fixincludes"; \
-       libsrcdir="$$s/fixincludes"; \
+       module_srcdir=fixincludes; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif build-fixincludes
 
@@ -2901,7 +2993,7 @@ all-build-fixincludes: configure-build-fixincludes
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS)  \
        (cd $(BUILD_SUBDIR)/fixincludes && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
                $(TARGET-build-fixincludes))
 @endif build-fixincludes
 
@@ -2934,11 +3026,12 @@ configure-bfd:
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif bfd
 
@@ -2967,11 +3060,12 @@ configure-stage1-bfd:
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
@@ -2999,12 +3093,12 @@ configure-stage2-bfd:
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
@@ -3032,12 +3126,12 @@ configure-stage3-bfd:
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
@@ -3065,12 +3159,12 @@ configure-stage4-bfd:
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
@@ -3098,12 +3192,12 @@ configure-stageprofile-bfd:
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
@@ -3131,12 +3225,12 @@ configure-stagefeedback-bfd:
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
@@ -3157,7 +3251,7 @@ all-bfd: configure-bfd
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/bfd && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-bfd))
 @endif bfd
 
@@ -3185,7 +3279,8 @@ all-stage1-bfd: configure-stage1-bfd
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-bfd)
 
@@ -3200,7 +3295,7 @@ clean-stage1-bfd:
        fi; \
        cd $(HOST_SUBDIR)/bfd && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif bfd-bootstrap
 
 
@@ -3241,9 +3336,7 @@ clean-stage2-bfd:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif bfd-bootstrap
 
 
@@ -3284,9 +3377,7 @@ clean-stage3-bfd:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif bfd-bootstrap
 
 
@@ -3327,9 +3418,7 @@ clean-stage4-bfd:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif bfd-bootstrap
 
 
@@ -3370,9 +3459,7 @@ clean-stageprofile-bfd:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif bfd-bootstrap
 
 
@@ -3413,9 +3500,7 @@ clean-stagefeedback-bfd:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif bfd-bootstrap
 
 
@@ -3815,11 +3900,12 @@ configure-opcodes:
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif opcodes
 
@@ -3848,11 +3934,12 @@ configure-stage1-opcodes:
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
@@ -3880,12 +3967,12 @@ configure-stage2-opcodes:
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
@@ -3913,12 +4000,12 @@ configure-stage3-opcodes:
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
@@ -3946,12 +4033,12 @@ configure-stage4-opcodes:
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
@@ -3979,12 +4066,12 @@ configure-stageprofile-opcodes:
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
@@ -4012,12 +4099,12 @@ configure-stagefeedback-opcodes:
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
@@ -4038,7 +4125,7 @@ all-opcodes: configure-opcodes
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/opcodes && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-opcodes))
 @endif opcodes
 
@@ -4066,7 +4153,8 @@ all-stage1-opcodes: configure-stage1-opcodes
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-opcodes)
 
@@ -4081,7 +4169,7 @@ clean-stage1-opcodes:
        fi; \
        cd $(HOST_SUBDIR)/opcodes && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif opcodes-bootstrap
 
 
@@ -4122,9 +4210,7 @@ clean-stage2-opcodes:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif opcodes-bootstrap
 
 
@@ -4165,9 +4251,7 @@ clean-stage3-opcodes:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif opcodes-bootstrap
 
 
@@ -4208,9 +4292,7 @@ clean-stage4-opcodes:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif opcodes-bootstrap
 
 
@@ -4251,9 +4333,7 @@ clean-stageprofile-opcodes:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif opcodes-bootstrap
 
 
@@ -4294,9 +4374,7 @@ clean-stagefeedback-opcodes:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif opcodes-bootstrap
 
 
@@ -4696,11 +4774,12 @@ configure-binutils:
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif binutils
 
@@ -4729,11 +4808,12 @@ configure-stage1-binutils:
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
@@ -4761,12 +4841,12 @@ configure-stage2-binutils:
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
@@ -4794,12 +4874,12 @@ configure-stage3-binutils:
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
@@ -4827,12 +4907,12 @@ configure-stage4-binutils:
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
@@ -4860,12 +4940,12 @@ configure-stageprofile-binutils:
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
@@ -4893,12 +4973,12 @@ configure-stagefeedback-binutils:
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
@@ -4919,7 +4999,7 @@ all-binutils: configure-binutils
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/binutils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-binutils))
 @endif binutils
 
@@ -4947,7 +5027,8 @@ all-stage1-binutils: configure-stage1-binutils
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-binutils)
 
@@ -4962,7 +5043,7 @@ clean-stage1-binutils:
        fi; \
        cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif binutils-bootstrap
 
 
@@ -5003,9 +5084,7 @@ clean-stage2-binutils:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif binutils-bootstrap
 
 
@@ -5046,9 +5125,7 @@ clean-stage3-binutils:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif binutils-bootstrap
 
 
@@ -5089,9 +5166,7 @@ clean-stage4-binutils:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif binutils-bootstrap
 
 
@@ -5132,9 +5207,7 @@ clean-stageprofile-binutils:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif binutils-bootstrap
 
 
@@ -5175,9 +5248,7 @@ clean-stagefeedback-binutils:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif binutils-bootstrap
 
 
@@ -5578,11 +5649,12 @@ configure-bison:
          *) topdir=`echo $(HOST_SUBDIR)/bison/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bison"; \
-       libsrcdir="$$s/bison"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bison; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif bison
 
@@ -5604,7 +5676,7 @@ all-bison: configure-bison
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/bison && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-bison))
 @endif bison
 
@@ -6021,11 +6093,12 @@ configure-cgen:
          *) topdir=`echo $(HOST_SUBDIR)/cgen/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cgen"; \
-       libsrcdir="$$s/cgen"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=cgen; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif cgen
 
@@ -6047,7 +6120,7 @@ all-cgen: configure-cgen
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/cgen && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-cgen))
 @endif cgen
 
@@ -6461,11 +6534,12 @@ configure-dejagnu:
          *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/dejagnu"; \
-       libsrcdir="$$s/dejagnu"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=dejagnu; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif dejagnu
 
@@ -6487,7 +6561,7 @@ all-dejagnu: configure-dejagnu
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/dejagnu && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-dejagnu))
 @endif dejagnu
 
@@ -6901,11 +6975,12 @@ configure-etc:
          *) topdir=`echo $(HOST_SUBDIR)/etc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/etc"; \
-       libsrcdir="$$s/etc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=etc; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif etc
 
@@ -6927,7 +7002,7 @@ all-etc: configure-etc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/etc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-etc))
 @endif etc
 
@@ -7341,11 +7416,12 @@ configure-fastjar:
          *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/fastjar"; \
-       libsrcdir="$$s/fastjar"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=fastjar; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif fastjar
 
@@ -7367,7 +7443,7 @@ all-fastjar: configure-fastjar
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-fastjar))
 @endif fastjar
 
@@ -7771,7 +7847,6 @@ configure-fixincludes: stage_current
 @if fixincludes
 maybe-configure-fixincludes: configure-fixincludes
 configure-fixincludes: 
-       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
@@ -7784,16 +7859,216 @@ configure-fixincludes:
          *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/fixincludes"; \
-       libsrcdir="$$s/fixincludes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=fixincludes; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif fixincludes
 
 
 
+.PHONY: configure-stage1-fixincludes maybe-configure-stage1-fixincludes
+maybe-configure-stage1-fixincludes:
+@if fixincludes-bootstrap
+maybe-configure-stage1-fixincludes: configure-stage1-fixincludes
+configure-stage1-fixincludes:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/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)/fixincludes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=fixincludes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif fixincludes-bootstrap
+
+.PHONY: configure-stage2-fixincludes maybe-configure-stage2-fixincludes
+maybe-configure-stage2-fixincludes:
+@if fixincludes-bootstrap
+maybe-configure-stage2-fixincludes: configure-stage2-fixincludes
+configure-stage2-fixincludes:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/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)/fixincludes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=fixincludes; \
+       $(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)  \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif fixincludes-bootstrap
+
+.PHONY: configure-stage3-fixincludes maybe-configure-stage3-fixincludes
+maybe-configure-stage3-fixincludes:
+@if fixincludes-bootstrap
+maybe-configure-stage3-fixincludes: configure-stage3-fixincludes
+configure-stage3-fixincludes:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/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)/fixincludes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=fixincludes; \
+       $(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 fixincludes-bootstrap
+
+.PHONY: configure-stage4-fixincludes maybe-configure-stage4-fixincludes
+maybe-configure-stage4-fixincludes:
+@if fixincludes-bootstrap
+maybe-configure-stage4-fixincludes: configure-stage4-fixincludes
+configure-stage4-fixincludes:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/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)/fixincludes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=fixincludes; \
+       $(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)  \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif fixincludes-bootstrap
+
+.PHONY: configure-stageprofile-fixincludes maybe-configure-stageprofile-fixincludes
+maybe-configure-stageprofile-fixincludes:
+@if fixincludes-bootstrap
+maybe-configure-stageprofile-fixincludes: configure-stageprofile-fixincludes
+configure-stageprofile-fixincludes:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/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)/fixincludes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=fixincludes; \
+       $(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)  \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif fixincludes-bootstrap
+
+.PHONY: configure-stagefeedback-fixincludes maybe-configure-stagefeedback-fixincludes
+maybe-configure-stagefeedback-fixincludes:
+@if fixincludes-bootstrap
+maybe-configure-stagefeedback-fixincludes: configure-stagefeedback-fixincludes
+configure-stagefeedback-fixincludes:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/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)/fixincludes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=fixincludes; \
+       $(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)  \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif fixincludes-bootstrap
+
+
+
 
 
 .PHONY: all-fixincludes maybe-all-fixincludes
@@ -7805,17 +8080,265 @@ all-fixincludes: stage_current
 TARGET-fixincludes=all
 maybe-all-fixincludes: all-fixincludes
 all-fixincludes: configure-fixincludes
-       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-fixincludes))
 @endif fixincludes
 
 
 
+.PHONY: all-stage1-fixincludes maybe-all-stage1-fixincludes
+.PHONY: clean-stage1-fixincludes maybe-clean-stage1-fixincludes
+maybe-all-stage1-fixincludes:
+maybe-clean-stage1-fixincludes:
+@if fixincludes-bootstrap
+maybe-all-stage1-fixincludes: all-stage1-fixincludes
+all-stage1: all-stage1-fixincludes
+TARGET-stage1-fixincludes = $(TARGET-fixincludes)
+all-stage1-fixincludes: configure-stage1-fixincludes
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_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_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-fixincludes)
+
+maybe-clean-stage1-fixincludes: clean-stage1-fixincludes
+clean-stage1: clean-stage1-fixincludes
+clean-stage1-fixincludes:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-fixincludes/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif fixincludes-bootstrap
+
+
+.PHONY: all-stage2-fixincludes maybe-all-stage2-fixincludes
+.PHONY: clean-stage2-fixincludes maybe-clean-stage2-fixincludes
+maybe-all-stage2-fixincludes:
+maybe-clean-stage2-fixincludes:
+@if fixincludes-bootstrap
+maybe-all-stage2-fixincludes: all-stage2-fixincludes
+all-stage2: all-stage2-fixincludes
+TARGET-stage2-fixincludes = $(TARGET-fixincludes)
+all-stage2-fixincludes: configure-stage2-fixincludes
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE2_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE2_TFLAGS)" \
+               $(TARGET-stage2-fixincludes)
+
+maybe-clean-stage2-fixincludes: clean-stage2-fixincludes
+clean-stage2: clean-stage2-fixincludes
+clean-stage2-fixincludes:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-fixincludes/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif fixincludes-bootstrap
+
+
+.PHONY: all-stage3-fixincludes maybe-all-stage3-fixincludes
+.PHONY: clean-stage3-fixincludes maybe-clean-stage3-fixincludes
+maybe-all-stage3-fixincludes:
+maybe-clean-stage3-fixincludes:
+@if fixincludes-bootstrap
+maybe-all-stage3-fixincludes: all-stage3-fixincludes
+all-stage3: all-stage3-fixincludes
+TARGET-stage3-fixincludes = $(TARGET-fixincludes)
+all-stage3-fixincludes: configure-stage3-fixincludes
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE3_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE3_TFLAGS)" \
+               $(TARGET-stage3-fixincludes)
+
+maybe-clean-stage3-fixincludes: clean-stage3-fixincludes
+clean-stage3: clean-stage3-fixincludes
+clean-stage3-fixincludes:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-fixincludes/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif fixincludes-bootstrap
+
+
+.PHONY: all-stage4-fixincludes maybe-all-stage4-fixincludes
+.PHONY: clean-stage4-fixincludes maybe-clean-stage4-fixincludes
+maybe-all-stage4-fixincludes:
+maybe-clean-stage4-fixincludes:
+@if fixincludes-bootstrap
+maybe-all-stage4-fixincludes: all-stage4-fixincludes
+all-stage4: all-stage4-fixincludes
+TARGET-stage4-fixincludes = $(TARGET-fixincludes)
+all-stage4-fixincludes: configure-stage4-fixincludes
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE4_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE4_TFLAGS)" \
+               $(TARGET-stage4-fixincludes)
+
+maybe-clean-stage4-fixincludes: clean-stage4-fixincludes
+clean-stage4: clean-stage4-fixincludes
+clean-stage4-fixincludes:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-fixincludes/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif fixincludes-bootstrap
+
+
+.PHONY: all-stageprofile-fixincludes maybe-all-stageprofile-fixincludes
+.PHONY: clean-stageprofile-fixincludes maybe-clean-stageprofile-fixincludes
+maybe-all-stageprofile-fixincludes:
+maybe-clean-stageprofile-fixincludes:
+@if fixincludes-bootstrap
+maybe-all-stageprofile-fixincludes: all-stageprofile-fixincludes
+all-stageprofile: all-stageprofile-fixincludes
+TARGET-stageprofile-fixincludes = $(TARGET-fixincludes)
+all-stageprofile-fixincludes: configure-stageprofile-fixincludes
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEprofile_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               $(TARGET-stageprofile-fixincludes)
+
+maybe-clean-stageprofile-fixincludes: clean-stageprofile-fixincludes
+clean-stageprofile: clean-stageprofile-fixincludes
+clean-stageprofile-fixincludes:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-fixincludes/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif fixincludes-bootstrap
+
+
+.PHONY: all-stagefeedback-fixincludes maybe-all-stagefeedback-fixincludes
+.PHONY: clean-stagefeedback-fixincludes maybe-clean-stagefeedback-fixincludes
+maybe-all-stagefeedback-fixincludes:
+maybe-clean-stagefeedback-fixincludes:
+@if fixincludes-bootstrap
+maybe-all-stagefeedback-fixincludes: all-stagefeedback-fixincludes
+all-stagefeedback: all-stagefeedback-fixincludes
+TARGET-stagefeedback-fixincludes = $(TARGET-fixincludes)
+all-stagefeedback-fixincludes: configure-stagefeedback-fixincludes
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEfeedback_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               $(TARGET-stagefeedback-fixincludes)
+
+maybe-clean-stagefeedback-fixincludes: clean-stagefeedback-fixincludes
+clean-stagefeedback: clean-stagefeedback-fixincludes
+clean-stagefeedback-fixincludes:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-fixincludes/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif fixincludes-bootstrap
+
+
+
+
 
 .PHONY: check-fixincludes maybe-check-fixincludes
 maybe-check-fixincludes:
@@ -7871,7 +8394,6 @@ maybe-info-fixincludes: info-fixincludes
 
 info-fixincludes: \
     configure-fixincludes 
-       @: $(MAKE); $(unstage)
        @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7897,7 +8419,6 @@ maybe-dvi-fixincludes: dvi-fixincludes
 
 dvi-fixincludes: \
     configure-fixincludes 
-       @: $(MAKE); $(unstage)
        @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7923,7 +8444,6 @@ maybe-pdf-fixincludes: pdf-fixincludes
 
 pdf-fixincludes: \
     configure-fixincludes 
-       @: $(MAKE); $(unstage)
        @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7949,7 +8469,6 @@ maybe-html-fixincludes: html-fixincludes
 
 html-fixincludes: \
     configure-fixincludes 
-       @: $(MAKE); $(unstage)
        @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7986,7 +8505,6 @@ maybe-install-info-fixincludes: install-info-fixincludes
 install-info-fixincludes: \
     configure-fixincludes \
     info-fixincludes 
-       @: $(MAKE); $(unstage)
        @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8013,7 +8531,6 @@ maybe-install-pdf-fixincludes: install-pdf-fixincludes
 install-pdf-fixincludes: \
     configure-fixincludes \
     pdf-fixincludes 
-       @: $(MAKE); $(unstage)
        @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8040,7 +8557,6 @@ maybe-install-html-fixincludes: install-html-fixincludes
 install-html-fixincludes: \
     configure-fixincludes \
     html-fixincludes 
-       @: $(MAKE); $(unstage)
        @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8066,7 +8582,6 @@ maybe-installcheck-fixincludes: installcheck-fixincludes
 
 installcheck-fixincludes: \
     configure-fixincludes 
-       @: $(MAKE); $(unstage)
        @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8091,7 +8606,6 @@ maybe-mostlyclean-fixincludes:
 maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
 
 mostlyclean-fixincludes: 
-       @: $(MAKE); $(unstage)
        @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8116,7 +8630,6 @@ maybe-clean-fixincludes:
 maybe-clean-fixincludes: clean-fixincludes
 
 clean-fixincludes: 
-       @: $(MAKE); $(unstage)
        @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8141,7 +8654,6 @@ maybe-distclean-fixincludes:
 maybe-distclean-fixincludes: distclean-fixincludes
 
 distclean-fixincludes: 
-       @: $(MAKE); $(unstage)
        @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8166,7 +8678,6 @@ maybe-maintainer-clean-fixincludes:
 maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
 
 maintainer-clean-fixincludes: 
-       @: $(MAKE); $(unstage)
        @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8208,11 +8719,12 @@ configure-flex:
          *) topdir=`echo $(HOST_SUBDIR)/flex/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/flex"; \
-       libsrcdir="$$s/flex"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=flex; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif flex
 
@@ -8234,7 +8746,7 @@ all-flex: configure-flex
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-flex))
 @endif flex
 
@@ -8650,11 +9162,12 @@ configure-gas:
          *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif gas
 
@@ -8683,11 +9196,12 @@ configure-stage1-gas:
          *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
@@ -8715,12 +9229,12 @@ configure-stage2-gas:
          *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
@@ -8748,12 +9262,12 @@ configure-stage3-gas:
          *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
@@ -8781,12 +9295,12 @@ configure-stage4-gas:
          *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
@@ -8814,12 +9328,12 @@ configure-stageprofile-gas:
          *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
@@ -8847,12 +9361,12 @@ configure-stagefeedback-gas:
          *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
@@ -8873,7 +9387,7 @@ all-gas: configure-gas
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-gas))
 @endif gas
 
@@ -8901,7 +9415,8 @@ all-stage1-gas: configure-stage1-gas
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-gas)
 
@@ -8916,7 +9431,7 @@ clean-stage1-gas:
        fi; \
        cd $(HOST_SUBDIR)/gas && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif gas-bootstrap
 
 
@@ -8957,9 +9472,7 @@ clean-stage2-gas:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gas-bootstrap
 
 
@@ -9000,9 +9513,7 @@ clean-stage3-gas:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gas-bootstrap
 
 
@@ -9043,9 +9554,7 @@ clean-stage4-gas:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gas-bootstrap
 
 
@@ -9086,9 +9595,7 @@ clean-stageprofile-gas:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gas-bootstrap
 
 
@@ -9129,9 +9636,7 @@ clean-stagefeedback-gas:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gas-bootstrap
 
 
@@ -9531,11 +10036,12 @@ configure-gcc:
          *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif gcc
 
@@ -9564,11 +10070,12 @@ configure-stage1-gcc:
          *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
@@ -9596,12 +10103,12 @@ configure-stage2-gcc:
          *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
@@ -9629,12 +10136,12 @@ configure-stage3-gcc:
          *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
@@ -9662,12 +10169,12 @@ configure-stage4-gcc:
          *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
@@ -9695,12 +10202,12 @@ configure-stageprofile-gcc:
          *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
@@ -9728,12 +10235,12 @@ configure-stagefeedback-gcc:
          *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
@@ -9754,7 +10261,7 @@ all-gcc: configure-gcc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
                $(TARGET-gcc))
 @endif gcc
 
@@ -9782,7 +10289,8 @@ all-stage1-gcc: configure-stage1-gcc
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)  $(EXTRA_GCC_FLAGS) \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-gcc)
 
@@ -9797,7 +10305,7 @@ clean-stage1-gcc:
        fi; \
        cd $(HOST_SUBDIR)/gcc && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(EXTRA_GCC_FLAGS) clean
+       $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
 
@@ -9838,9 +10346,7 @@ clean-stage2-gcc:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
 
@@ -9881,9 +10387,7 @@ clean-stage3-gcc:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
 
@@ -9924,9 +10428,7 @@ clean-stage4-gcc:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
 
@@ -9967,9 +10469,7 @@ clean-stageprofile-gcc:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
 
@@ -10010,9 +10510,7 @@ clean-stagefeedback-gcc:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
 
@@ -10412,11 +10910,12 @@ configure-gmp:
          *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} --disable-shared \
+         --target=none-${host_vendor}-${host_os} --disable-shared \
          || exit 1
 @endif gmp
 
@@ -10445,11 +10944,12 @@ configure-stage1-gmp:
          *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+         --target=none-${host_vendor}-${host_os} \
+          \
          $(STAGE1_CONFIGURE_FLAGS) \
          --disable-shared
 @endif gmp-bootstrap
@@ -10478,12 +10978,12 @@ configure-stage2-gmp:
          *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=none-${host_vendor}-${host_os} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS) \
          --disable-shared
 @endif gmp-bootstrap
@@ -10512,12 +11012,12 @@ configure-stage3-gmp:
          *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=none-${host_vendor}-${host_os} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS) \
          --disable-shared
 @endif gmp-bootstrap
@@ -10546,12 +11046,12 @@ configure-stage4-gmp:
          *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=none-${host_vendor}-${host_os} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS) \
          --disable-shared
 @endif gmp-bootstrap
@@ -10580,12 +11080,12 @@ configure-stageprofile-gmp:
          *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=none-${host_vendor}-${host_os} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS) \
          --disable-shared
 @endif gmp-bootstrap
@@ -10614,12 +11114,12 @@ configure-stagefeedback-gmp:
          *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=none-${host_vendor}-${host_os} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
          --disable-shared
 @endif gmp-bootstrap
@@ -10641,7 +11141,7 @@ all-gmp: configure-gmp
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/gmp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-gmp))
 @endif gmp
 
@@ -10669,7 +11169,8 @@ all-stage1-gmp: configure-stage1-gmp
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-gmp)
 
@@ -10684,7 +11185,7 @@ clean-stage1-gmp:
        fi; \
        cd $(HOST_SUBDIR)/gmp && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif gmp-bootstrap
 
 
@@ -10725,9 +11226,7 @@ clean-stage2-gmp:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gmp-bootstrap
 
 
@@ -10768,9 +11267,7 @@ clean-stage3-gmp:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gmp-bootstrap
 
 
@@ -10811,9 +11308,7 @@ clean-stage4-gmp:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gmp-bootstrap
 
 
@@ -10854,9 +11349,7 @@ clean-stageprofile-gmp:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gmp-bootstrap
 
 
@@ -10897,9 +11390,7 @@ clean-stagefeedback-gmp:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gmp-bootstrap
 
 
@@ -11287,11 +11778,12 @@ configure-mpfr:
          *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpfr_configure_flags@ \
+         --target=${target_alias} --disable-shared @extra_mpfr_configure_flags@ \
          || exit 1
 @endif mpfr
 
@@ -11320,11 +11812,12 @@ configure-stage1-mpfr:
          *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
@@ -11353,12 +11846,12 @@ configure-stage2-mpfr:
          *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
@@ -11387,12 +11880,12 @@ configure-stage3-mpfr:
          *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
@@ -11421,12 +11914,12 @@ configure-stage4-mpfr:
          *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
@@ -11455,12 +11948,12 @@ configure-stageprofile-mpfr:
          *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
@@ -11489,12 +11982,12 @@ configure-stagefeedback-mpfr:
          *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
@@ -11516,7 +12009,7 @@ all-mpfr: configure-mpfr
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/mpfr && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-mpfr))
 @endif mpfr
 
@@ -11544,7 +12037,8 @@ all-stage1-mpfr: configure-stage1-mpfr
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-mpfr)
 
@@ -11559,7 +12053,7 @@ clean-stage1-mpfr:
        fi; \
        cd $(HOST_SUBDIR)/mpfr && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif mpfr-bootstrap
 
 
@@ -11600,9 +12094,7 @@ clean-stage2-mpfr:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif mpfr-bootstrap
 
 
@@ -11643,9 +12135,7 @@ clean-stage3-mpfr:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif mpfr-bootstrap
 
 
@@ -11686,9 +12176,7 @@ clean-stage4-mpfr:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif mpfr-bootstrap
 
 
@@ -11729,9 +12217,7 @@ clean-stageprofile-mpfr:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif mpfr-bootstrap
 
 
@@ -11772,9 +12258,7 @@ clean-stagefeedback-mpfr:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif mpfr-bootstrap
 
 
@@ -12162,11 +12646,12 @@ configure-mpc:
          *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
+         --target=${target_alias} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
          || exit 1
 @endif mpc
 
@@ -12195,11 +12680,12 @@ configure-stage1-mpc:
          *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
@@ -12228,12 +12714,12 @@ configure-stage2-mpc:
          *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
@@ -12262,12 +12748,12 @@ configure-stage3-mpc:
          *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
@@ -12296,12 +12782,12 @@ configure-stage4-mpc:
          *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
@@ -12330,12 +12816,12 @@ configure-stageprofile-mpc:
          *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
@@ -12364,12 +12850,12 @@ configure-stagefeedback-mpc:
          *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
@@ -12391,7 +12877,7 @@ all-mpc: configure-mpc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/mpc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-mpc))
 @endif mpc
 
@@ -12419,7 +12905,8 @@ all-stage1-mpc: configure-stage1-mpc
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-mpc)
 
@@ -12434,7 +12921,7 @@ clean-stage1-mpc:
        fi; \
        cd $(HOST_SUBDIR)/mpc && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif mpc-bootstrap
 
 
@@ -12475,9 +12962,7 @@ clean-stage2-mpc:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif mpc-bootstrap
 
 
@@ -12518,9 +13003,7 @@ clean-stage3-mpc:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif mpc-bootstrap
 
 
@@ -12561,9 +13044,7 @@ clean-stage4-mpc:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif mpc-bootstrap
 
 
@@ -12604,9 +13085,7 @@ clean-stageprofile-mpc:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif mpc-bootstrap
 
 
@@ -12647,9 +13126,7 @@ clean-stagefeedback-mpc:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif mpc-bootstrap
 
 
@@ -13037,11 +13514,12 @@ configure-isl:
          *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp \
+         --target=${target_alias} --disable-shared @extra_isl_gmp_configure_flags@ \
          || exit 1
 @endif isl
 
@@ -13070,13 +13548,14 @@ configure-stage1-isl:
          *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp
+         --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
 
 .PHONY: configure-stage2-isl maybe-configure-stage2-isl
@@ -13103,14 +13582,14 @@ configure-stage2-isl:
          *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp
+         --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
 
 .PHONY: configure-stage3-isl maybe-configure-stage3-isl
@@ -13137,14 +13616,14 @@ configure-stage3-isl:
          *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp
+         --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
 
 .PHONY: configure-stage4-isl maybe-configure-stage4-isl
@@ -13171,14 +13650,14 @@ configure-stage4-isl:
          *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp
+         --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
 
 .PHONY: configure-stageprofile-isl maybe-configure-stageprofile-isl
@@ -13205,14 +13684,14 @@ configure-stageprofile-isl:
          *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp
+         --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
 
 .PHONY: configure-stagefeedback-isl maybe-configure-stagefeedback-isl
@@ -13239,14 +13718,14 @@ configure-stagefeedback-isl:
          *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp
+         --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
 
 
@@ -13266,7 +13745,7 @@ all-isl: configure-isl
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/isl && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) V=1 \
                $(TARGET-isl))
 @endif isl
 
@@ -13294,7 +13773,8 @@ all-stage1-isl: configure-stage1-isl
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS) V=1 \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-isl)
 
@@ -13309,7 +13789,7 @@ clean-stage1-isl:
        fi; \
        cd $(HOST_SUBDIR)/isl && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS) V=1 clean
 @endif isl-bootstrap
 
 
@@ -13336,7 +13816,7 @@ all-stage2-isl: configure-stage2-isl
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
                TFLAGS="$(STAGE2_TFLAGS)" \
                $(TARGET-stage2-isl)
 
@@ -13350,9 +13830,7 @@ clean-stage2-isl:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/isl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
 @endif isl-bootstrap
 
 
@@ -13379,7 +13857,7 @@ all-stage3-isl: configure-stage3-isl
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
                TFLAGS="$(STAGE3_TFLAGS)" \
                $(TARGET-stage3-isl)
 
@@ -13393,9 +13871,7 @@ clean-stage3-isl:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/isl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
 @endif isl-bootstrap
 
 
@@ -13422,7 +13898,7 @@ all-stage4-isl: configure-stage4-isl
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
                TFLAGS="$(STAGE4_TFLAGS)" \
                $(TARGET-stage4-isl)
 
@@ -13436,9 +13912,7 @@ clean-stage4-isl:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/isl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
 @endif isl-bootstrap
 
 
@@ -13465,7 +13939,7 @@ all-stageprofile-isl: configure-stageprofile-isl
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
                $(TARGET-stageprofile-isl)
 
@@ -13479,9 +13953,7 @@ clean-stageprofile-isl:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/isl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
 @endif isl-bootstrap
 
 
@@ -13508,7 +13980,7 @@ all-stagefeedback-isl: configure-stagefeedback-isl
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
                $(TARGET-stagefeedback-isl)
 
@@ -13522,9 +13994,7 @@ clean-stagefeedback-isl:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/isl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
 @endif isl-bootstrap
 
 
@@ -13542,7 +14012,7 @@ check-isl:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/isl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS) V=1 check)
 
 @endif isl
 
@@ -13577,7 +14047,7 @@ info-isl: \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in isl" ; \
@@ -13602,7 +14072,7 @@ dvi-isl: \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in isl" ; \
@@ -13627,7 +14097,7 @@ pdf-isl: \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing pdf in isl" ; \
@@ -13652,7 +14122,7 @@ html-isl: \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing html in isl" ; \
@@ -13677,7 +14147,7 @@ TAGS-isl: \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in isl" ; \
@@ -13703,7 +14173,7 @@ install-info-isl: \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in isl" ; \
@@ -13729,7 +14199,7 @@ install-pdf-isl: \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-pdf in isl" ; \
@@ -13755,7 +14225,7 @@ install-html-isl: \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-html in isl" ; \
@@ -13780,7 +14250,7 @@ installcheck-isl: \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in isl" ; \
@@ -13804,7 +14274,7 @@ mostlyclean-isl:
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in isl" ; \
@@ -13828,7 +14298,7 @@ clean-isl:
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in isl" ; \
@@ -13852,7 +14322,7 @@ distclean-isl:
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in isl" ; \
@@ -13876,7 +14346,7 @@ maintainer-clean-isl:
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in isl" ; \
@@ -13904,7 +14374,7 @@ configure-cloog:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       $(HOST_EXPORTS) CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       $(HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        echo Configuring in $(HOST_SUBDIR)/cloog; \
        cd "$(HOST_SUBDIR)/cloog" || exit 1; \
        case $(srcdir) in \
@@ -13912,11 +14382,12 @@ configure-cloog:
          *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=cloog; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-isl=system \
+         --target=${target_alias} --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \
          || exit 1
 @endif cloog
 
@@ -13936,7 +14407,7 @@ configure-stage1-cloog:
        $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        echo Configuring stage 1 in $(HOST_SUBDIR)/cloog ; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
        cd $(HOST_SUBDIR)/cloog || exit 1; \
@@ -13945,13 +14416,14 @@ configure-stage1-cloog:
          *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=cloog; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-isl=system
+         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
 @endif cloog-bootstrap
 
 .PHONY: configure-stage2-cloog maybe-configure-stage2-cloog
@@ -13969,7 +14441,7 @@ configure-stage2-cloog:
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        echo Configuring stage 2 in $(HOST_SUBDIR)/cloog ; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
        cd $(HOST_SUBDIR)/cloog || exit 1; \
@@ -13978,14 +14450,14 @@ configure-stage2-cloog:
          *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=cloog; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-isl=system
+         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
 @endif cloog-bootstrap
 
 .PHONY: configure-stage3-cloog maybe-configure-stage3-cloog
@@ -14003,7 +14475,7 @@ configure-stage3-cloog:
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        echo Configuring stage 3 in $(HOST_SUBDIR)/cloog ; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
        cd $(HOST_SUBDIR)/cloog || exit 1; \
@@ -14012,14 +14484,14 @@ configure-stage3-cloog:
          *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=cloog; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-isl=system
+         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
 @endif cloog-bootstrap
 
 .PHONY: configure-stage4-cloog maybe-configure-stage4-cloog
@@ -14037,7 +14509,7 @@ configure-stage4-cloog:
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        echo Configuring stage 4 in $(HOST_SUBDIR)/cloog ; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
        cd $(HOST_SUBDIR)/cloog || exit 1; \
@@ -14046,14 +14518,14 @@ configure-stage4-cloog:
          *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=cloog; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-isl=system
+         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
 @endif cloog-bootstrap
 
 .PHONY: configure-stageprofile-cloog maybe-configure-stageprofile-cloog
@@ -14071,7 +14543,7 @@ configure-stageprofile-cloog:
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        echo Configuring stage profile in $(HOST_SUBDIR)/cloog ; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
        cd $(HOST_SUBDIR)/cloog || exit 1; \
@@ -14080,14 +14552,14 @@ configure-stageprofile-cloog:
          *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=cloog; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-isl=system
+         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
 @endif cloog-bootstrap
 
 .PHONY: configure-stagefeedback-cloog maybe-configure-stagefeedback-cloog
@@ -14105,7 +14577,7 @@ configure-stagefeedback-cloog:
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        echo Configuring stage feedback in $(HOST_SUBDIR)/cloog ; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
        cd $(HOST_SUBDIR)/cloog || exit 1; \
@@ -14114,14 +14586,14 @@ configure-stagefeedback-cloog:
          *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=cloog; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-isl=system
+         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
 @endif cloog-bootstrap
 
 
@@ -14139,9 +14611,9 @@ maybe-all-cloog: all-cloog
 all-cloog: configure-cloog
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       $(HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        (cd $(HOST_SUBDIR)/cloog && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
                $(TARGET-cloog))
 @endif cloog
 
@@ -14160,7 +14632,7 @@ all-stage1-cloog: configure-stage1-cloog
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(HOST_EXPORTS) CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       $(HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
@@ -14169,7 +14641,8 @@ all-stage1-cloog: configure-stage1-cloog
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)  CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-cloog)
 
@@ -14184,7 +14657,7 @@ clean-stage1-cloog:
        fi; \
        cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
+       $(STAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
 @endif cloog-bootstrap
 
 
@@ -14202,7 +14675,7 @@ all-stage2-cloog: configure-stage2-cloog
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
@@ -14225,9 +14698,7 @@ clean-stage2-cloog:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
 @endif cloog-bootstrap
 
 
@@ -14245,7 +14716,7 @@ all-stage3-cloog: configure-stage3-cloog
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
@@ -14268,9 +14739,7 @@ clean-stage3-cloog:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
 @endif cloog-bootstrap
 
 
@@ -14288,7 +14757,7 @@ all-stage4-cloog: configure-stage4-cloog
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
@@ -14311,9 +14780,7 @@ clean-stage4-cloog:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
 @endif cloog-bootstrap
 
 
@@ -14331,7 +14798,7 @@ all-stageprofile-cloog: configure-stageprofile-cloog
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
@@ -14354,9 +14821,7 @@ clean-stageprofile-cloog:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
 @endif cloog-bootstrap
 
 
@@ -14374,7 +14839,7 @@ all-stagefeedback-cloog: configure-stagefeedback-cloog
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
+       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
        cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
@@ -14397,9 +14862,7 @@ clean-stagefeedback-cloog:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
 @endif cloog-bootstrap
 
 
@@ -14787,11 +15250,12 @@ configure-libelf:
          *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared \
+         --target=${target_alias} --disable-shared \
          || exit 1
 @endif libelf
 
@@ -14820,11 +15284,12 @@ configure-stage1-libelf:
          *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS) \
          --disable-shared
 @endif libelf-bootstrap
@@ -14853,12 +15318,12 @@ configure-stage2-libelf:
          *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS) \
          --disable-shared
 @endif libelf-bootstrap
@@ -14887,12 +15352,12 @@ configure-stage3-libelf:
          *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS) \
          --disable-shared
 @endif libelf-bootstrap
@@ -14921,12 +15386,12 @@ configure-stage4-libelf:
          *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS) \
          --disable-shared
 @endif libelf-bootstrap
@@ -14955,12 +15420,12 @@ configure-stageprofile-libelf:
          *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS) \
          --disable-shared
 @endif libelf-bootstrap
@@ -14989,12 +15454,12 @@ configure-stagefeedback-libelf:
          *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
          --disable-shared
 @endif libelf-bootstrap
@@ -15016,7 +15481,7 @@ all-libelf: configure-libelf
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/libelf && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-libelf))
 @endif libelf
 
@@ -15044,7 +15509,8 @@ all-stage1-libelf: configure-stage1-libelf
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-libelf)
 
@@ -15059,7 +15525,7 @@ clean-stage1-libelf:
        fi; \
        cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif libelf-bootstrap
 
 
@@ -15100,9 +15566,7 @@ clean-stage2-libelf:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/libelf && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif libelf-bootstrap
 
 
@@ -15143,9 +15607,7 @@ clean-stage3-libelf:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/libelf && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif libelf-bootstrap
 
 
@@ -15186,9 +15648,7 @@ clean-stage4-libelf:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/libelf && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif libelf-bootstrap
 
 
@@ -15229,9 +15689,7 @@ clean-stageprofile-libelf:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/libelf && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif libelf-bootstrap
 
 
@@ -15272,9 +15730,7 @@ clean-stagefeedback-libelf:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/libelf && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif libelf-bootstrap
 
 
@@ -15662,11 +16118,12 @@ configure-gold:
          *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif gold
 
@@ -15695,11 +16152,12 @@ configure-stage1-gold:
          *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
@@ -15727,12 +16185,12 @@ configure-stage2-gold:
          *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
@@ -15760,12 +16218,12 @@ configure-stage3-gold:
          *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
@@ -15793,12 +16251,12 @@ configure-stage4-gold:
          *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
@@ -15826,12 +16284,12 @@ configure-stageprofile-gold:
          *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
@@ -15859,12 +16317,12 @@ configure-stagefeedback-gold:
          *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
@@ -15885,7 +16343,7 @@ all-gold: configure-gold
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/gold && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-gold))
 @endif gold
 
@@ -15913,7 +16371,8 @@ all-stage1-gold: configure-stage1-gold
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-gold)
 
@@ -15928,7 +16387,7 @@ clean-stage1-gold:
        fi; \
        cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif gold-bootstrap
 
 
@@ -15969,9 +16428,7 @@ clean-stage2-gold:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gold-bootstrap
 
 
@@ -16012,9 +16469,7 @@ clean-stage3-gold:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gold-bootstrap
 
 
@@ -16055,9 +16510,7 @@ clean-stage4-gold:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gold-bootstrap
 
 
@@ -16098,9 +16551,7 @@ clean-stageprofile-gold:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gold-bootstrap
 
 
@@ -16141,9 +16592,7 @@ clean-stagefeedback-gold:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif gold-bootstrap
 
 
@@ -16544,11 +16993,12 @@ configure-gprof:
          *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gprof"; \
-       libsrcdir="$$s/gprof"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gprof; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif gprof
 
@@ -16570,7 +17020,7 @@ all-gprof: configure-gprof
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-gprof))
 @endif gprof
 
@@ -16983,11 +17433,12 @@ configure-intl:
          *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif intl
 
@@ -17016,11 +17467,12 @@ configure-stage1-intl:
          *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
@@ -17048,12 +17500,12 @@ configure-stage2-intl:
          *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
@@ -17081,12 +17533,12 @@ configure-stage3-intl:
          *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
@@ -17114,12 +17566,12 @@ configure-stage4-intl:
          *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
@@ -17147,12 +17599,12 @@ configure-stageprofile-intl:
          *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
@@ -17180,12 +17632,12 @@ configure-stagefeedback-intl:
          *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
@@ -17206,7 +17658,7 @@ all-intl: configure-intl
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/intl && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-intl))
 @endif intl
 
@@ -17234,7 +17686,8 @@ all-stage1-intl: configure-stage1-intl
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-intl)
 
@@ -17249,7 +17702,7 @@ clean-stage1-intl:
        fi; \
        cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif intl-bootstrap
 
 
@@ -17290,9 +17743,7 @@ clean-stage2-intl:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif intl-bootstrap
 
 
@@ -17333,9 +17784,7 @@ clean-stage3-intl:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif intl-bootstrap
 
 
@@ -17376,9 +17825,7 @@ clean-stage4-intl:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif intl-bootstrap
 
 
@@ -17419,9 +17866,7 @@ clean-stageprofile-intl:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif intl-bootstrap
 
 
@@ -17462,9 +17907,7 @@ clean-stagefeedback-intl:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif intl-bootstrap
 
 
@@ -17865,11 +18308,12 @@ configure-tcl:
          *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/tcl"; \
-       libsrcdir="$$s/tcl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=tcl; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif tcl
 
@@ -17891,7 +18335,7 @@ all-tcl: configure-tcl
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/tcl && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-tcl))
 @endif tcl
 
@@ -18290,11 +18734,12 @@ configure-itcl:
          *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/itcl"; \
-       libsrcdir="$$s/itcl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=itcl; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif itcl
 
@@ -18316,7 +18761,7 @@ all-itcl: configure-itcl
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/itcl && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-itcl))
 @endif itcl
 
@@ -18729,11 +19174,12 @@ configure-ld:
          *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif ld
 
@@ -18762,11 +19208,12 @@ configure-stage1-ld:
          *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
@@ -18794,12 +19241,12 @@ configure-stage2-ld:
          *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
@@ -18827,12 +19274,12 @@ configure-stage3-ld:
          *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
@@ -18860,12 +19307,12 @@ configure-stage4-ld:
          *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
@@ -18893,12 +19340,12 @@ configure-stageprofile-ld:
          *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
@@ -18926,12 +19373,12 @@ configure-stagefeedback-ld:
          *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
@@ -18952,7 +19399,7 @@ all-ld: configure-ld
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/ld && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-ld))
 @endif ld
 
@@ -18980,7 +19427,8 @@ all-stage1-ld: configure-stage1-ld
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-ld)
 
@@ -18995,7 +19443,7 @@ clean-stage1-ld:
        fi; \
        cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif ld-bootstrap
 
 
@@ -19036,9 +19484,7 @@ clean-stage2-ld:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif ld-bootstrap
 
 
@@ -19079,9 +19525,7 @@ clean-stage3-ld:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif ld-bootstrap
 
 
@@ -19122,9 +19566,7 @@ clean-stage4-ld:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif ld-bootstrap
 
 
@@ -19165,9 +19607,7 @@ clean-stageprofile-ld:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif ld-bootstrap
 
 
@@ -19208,9 +19648,7 @@ clean-stagefeedback-ld:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif ld-bootstrap
 
 
@@ -19590,270 +20028,272 @@ maintainer-clean-ld:
 
 
 
-.PHONY: configure-libcpp maybe-configure-libcpp
-maybe-configure-libcpp:
+.PHONY: configure-libbacktrace maybe-configure-libbacktrace
+maybe-configure-libbacktrace:
 @if gcc-bootstrap
-configure-libcpp: stage_current
+configure-libbacktrace: stage_current
 @endif gcc-bootstrap
-@if libcpp
-maybe-configure-libcpp: configure-libcpp
-configure-libcpp
+@if libbacktrace
+maybe-configure-libbacktrace: configure-libbacktrace
+configure-libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libcpp; \
-       cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libbacktrace; \
+       cd "$(HOST_SUBDIR)/libbacktrace" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
-@endif libcpp
+@endif libbacktrace
 
 
 
-.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
-maybe-configure-stage1-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage1-libcpp: configure-stage1-libcpp
-configure-stage1-libcpp:
+.PHONY: configure-stage1-libbacktrace maybe-configure-stage1-libbacktrace
+maybe-configure-stage1-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-configure-stage1-libbacktrace: configure-stage1-libbacktrace
+configure-stage1-libbacktrace:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/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)/libcpp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/libbacktrace ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       cd $(HOST_SUBDIR)/libbacktrace || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
+@endif libbacktrace-bootstrap
 
-.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
-maybe-configure-stage2-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage2-libcpp: configure-stage2-libcpp
-configure-stage2-libcpp:
+.PHONY: configure-stage2-libbacktrace maybe-configure-stage2-libbacktrace
+maybe-configure-stage2-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-configure-stage2-libbacktrace: configure-stage2-libbacktrace
+configure-stage2-libbacktrace:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/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)/libcpp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/libbacktrace ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       cd $(HOST_SUBDIR)/libbacktrace || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
+@endif libbacktrace-bootstrap
 
-.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
-maybe-configure-stage3-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage3-libcpp: configure-stage3-libcpp
-configure-stage3-libcpp:
+.PHONY: configure-stage3-libbacktrace maybe-configure-stage3-libbacktrace
+maybe-configure-stage3-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-configure-stage3-libbacktrace: configure-stage3-libbacktrace
+configure-stage3-libbacktrace:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/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)/libcpp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/libbacktrace ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       cd $(HOST_SUBDIR)/libbacktrace || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
+@endif libbacktrace-bootstrap
 
-.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
-maybe-configure-stage4-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage4-libcpp: configure-stage4-libcpp
-configure-stage4-libcpp:
+.PHONY: configure-stage4-libbacktrace maybe-configure-stage4-libbacktrace
+maybe-configure-stage4-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-configure-stage4-libbacktrace: configure-stage4-libbacktrace
+configure-stage4-libbacktrace:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/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)/libcpp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/libbacktrace ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       cd $(HOST_SUBDIR)/libbacktrace || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
+@endif libbacktrace-bootstrap
 
-.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
-maybe-configure-stageprofile-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
-configure-stageprofile-libcpp:
+.PHONY: configure-stageprofile-libbacktrace maybe-configure-stageprofile-libbacktrace
+maybe-configure-stageprofile-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-configure-stageprofile-libbacktrace: configure-stageprofile-libbacktrace
+configure-stageprofile-libbacktrace:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/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)/libcpp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libbacktrace ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       cd $(HOST_SUBDIR)/libbacktrace || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
+@endif libbacktrace-bootstrap
 
-.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
-maybe-configure-stagefeedback-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
-configure-stagefeedback-libcpp:
+.PHONY: configure-stagefeedback-libbacktrace maybe-configure-stagefeedback-libbacktrace
+maybe-configure-stagefeedback-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-configure-stagefeedback-libbacktrace: configure-stagefeedback-libbacktrace
+configure-stagefeedback-libbacktrace:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/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)/libcpp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/libbacktrace ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       cd $(HOST_SUBDIR)/libbacktrace || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
+@endif libbacktrace-bootstrap
 
 
 
 
 
-.PHONY: all-libcpp maybe-all-libcpp
-maybe-all-libcpp:
+.PHONY: all-libbacktrace maybe-all-libbacktrace
+maybe-all-libbacktrace:
 @if gcc-bootstrap
-all-libcpp: stage_current
+all-libbacktrace: stage_current
 @endif gcc-bootstrap
-@if libcpp
-TARGET-libcpp=all
-maybe-all-libcpp: all-libcpp
-all-libcpp: configure-libcpp
+@if libbacktrace
+TARGET-libbacktrace=all
+maybe-all-libbacktrace: all-libbacktrace
+all-libbacktrace: configure-libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/libcpp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libcpp))
-@endif libcpp
-
-
-
-.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
-.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
-maybe-all-stage1-libcpp:
-maybe-clean-stage1-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage1-libcpp: all-stage1-libcpp
-all-stage1: all-stage1-libcpp
-TARGET-stage1-libcpp = $(TARGET-libcpp)
-all-stage1-libcpp: configure-stage1-libcpp
+       (cd $(HOST_SUBDIR)/libbacktrace && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libbacktrace))
+@endif libbacktrace
+
+
+
+.PHONY: all-stage1-libbacktrace maybe-all-stage1-libbacktrace
+.PHONY: clean-stage1-libbacktrace maybe-clean-stage1-libbacktrace
+maybe-all-stage1-libbacktrace:
+maybe-clean-stage1-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-all-stage1-libbacktrace: all-stage1-libbacktrace
+all-stage1: all-stage1-libbacktrace
+TARGET-stage1-libbacktrace = $(TARGET-libbacktrace)
+all-stage1-libbacktrace: configure-stage1-libbacktrace
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
        $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcpp && \
+       cd $(HOST_SUBDIR)/libbacktrace && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -19861,41 +20301,42 @@ all-stage1-libcpp: configure-stage1-libcpp
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-libcpp)
+               $(TARGET-stage1-libbacktrace)
 
-maybe-clean-stage1-libcpp: clean-stage1-libcpp
-clean-stage1: clean-stage1-libcpp
-clean-stage1-libcpp:
+maybe-clean-stage1-libbacktrace: clean-stage1-libbacktrace
+clean-stage1: clean-stage1-libbacktrace
+clean-stage1-libbacktrace:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-libbacktrace/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
+       cd $(HOST_SUBDIR)/libbacktrace && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
-.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
-maybe-all-stage2-libcpp:
-maybe-clean-stage2-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage2-libcpp: all-stage2-libcpp
-all-stage2: all-stage2-libcpp
-TARGET-stage2-libcpp = $(TARGET-libcpp)
-all-stage2-libcpp: configure-stage2-libcpp
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libbacktrace-bootstrap
+
+
+.PHONY: all-stage2-libbacktrace maybe-all-stage2-libbacktrace
+.PHONY: clean-stage2-libbacktrace maybe-clean-stage2-libbacktrace
+maybe-all-stage2-libbacktrace:
+maybe-clean-stage2-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-all-stage2-libbacktrace: all-stage2-libbacktrace
+all-stage2: all-stage2-libbacktrace
+TARGET-stage2-libbacktrace = $(TARGET-libbacktrace)
+all-stage2-libbacktrace: configure-stage2-libbacktrace
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcpp && \
+       cd $(HOST_SUBDIR)/libbacktrace && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -19905,40 +20346,38 @@ all-stage2-libcpp: configure-stage2-libcpp
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-libcpp)
+               $(TARGET-stage2-libbacktrace)
 
-maybe-clean-stage2-libcpp: clean-stage2-libcpp
-clean-stage2: clean-stage2-libcpp
-clean-stage2-libcpp:
+maybe-clean-stage2-libbacktrace: clean-stage2-libbacktrace
+clean-stage2: clean-stage2-libbacktrace
+clean-stage2-libbacktrace:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-libbacktrace/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
-.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
-maybe-all-stage3-libcpp:
-maybe-clean-stage3-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage3-libcpp: all-stage3-libcpp
-all-stage3: all-stage3-libcpp
-TARGET-stage3-libcpp = $(TARGET-libcpp)
-all-stage3-libcpp: configure-stage3-libcpp
+       cd $(HOST_SUBDIR)/libbacktrace && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libbacktrace-bootstrap
+
+
+.PHONY: all-stage3-libbacktrace maybe-all-stage3-libbacktrace
+.PHONY: clean-stage3-libbacktrace maybe-clean-stage3-libbacktrace
+maybe-all-stage3-libbacktrace:
+maybe-clean-stage3-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-all-stage3-libbacktrace: all-stage3-libbacktrace
+all-stage3: all-stage3-libbacktrace
+TARGET-stage3-libbacktrace = $(TARGET-libbacktrace)
+all-stage3-libbacktrace: configure-stage3-libbacktrace
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcpp && \
+       cd $(HOST_SUBDIR)/libbacktrace && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -19948,40 +20387,38 @@ all-stage3-libcpp: configure-stage3-libcpp
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-libcpp)
+               $(TARGET-stage3-libbacktrace)
 
-maybe-clean-stage3-libcpp: clean-stage3-libcpp
-clean-stage3: clean-stage3-libcpp
-clean-stage3-libcpp:
+maybe-clean-stage3-libbacktrace: clean-stage3-libbacktrace
+clean-stage3: clean-stage3-libbacktrace
+clean-stage3-libbacktrace:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-libbacktrace/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
-.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
-maybe-all-stage4-libcpp:
-maybe-clean-stage4-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage4-libcpp: all-stage4-libcpp
-all-stage4: all-stage4-libcpp
-TARGET-stage4-libcpp = $(TARGET-libcpp)
-all-stage4-libcpp: configure-stage4-libcpp
+       cd $(HOST_SUBDIR)/libbacktrace && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libbacktrace-bootstrap
+
+
+.PHONY: all-stage4-libbacktrace maybe-all-stage4-libbacktrace
+.PHONY: clean-stage4-libbacktrace maybe-clean-stage4-libbacktrace
+maybe-all-stage4-libbacktrace:
+maybe-clean-stage4-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-all-stage4-libbacktrace: all-stage4-libbacktrace
+all-stage4: all-stage4-libbacktrace
+TARGET-stage4-libbacktrace = $(TARGET-libbacktrace)
+all-stage4-libbacktrace: configure-stage4-libbacktrace
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcpp && \
+       cd $(HOST_SUBDIR)/libbacktrace && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -19991,40 +20428,38 @@ all-stage4-libcpp: configure-stage4-libcpp
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-libcpp)
+               $(TARGET-stage4-libbacktrace)
 
-maybe-clean-stage4-libcpp: clean-stage4-libcpp
-clean-stage4: clean-stage4-libcpp
-clean-stage4-libcpp:
+maybe-clean-stage4-libbacktrace: clean-stage4-libbacktrace
+clean-stage4: clean-stage4-libbacktrace
+clean-stage4-libbacktrace:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-libbacktrace/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
-.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
-maybe-all-stageprofile-libcpp:
-maybe-clean-stageprofile-libcpp:
-@if libcpp-bootstrap
-maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
-all-stageprofile: all-stageprofile-libcpp
-TARGET-stageprofile-libcpp = $(TARGET-libcpp)
-all-stageprofile-libcpp: configure-stageprofile-libcpp
+       cd $(HOST_SUBDIR)/libbacktrace && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libbacktrace-bootstrap
+
+
+.PHONY: all-stageprofile-libbacktrace maybe-all-stageprofile-libbacktrace
+.PHONY: clean-stageprofile-libbacktrace maybe-clean-stageprofile-libbacktrace
+maybe-all-stageprofile-libbacktrace:
+maybe-clean-stageprofile-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-all-stageprofile-libbacktrace: all-stageprofile-libbacktrace
+all-stageprofile: all-stageprofile-libbacktrace
+TARGET-stageprofile-libbacktrace = $(TARGET-libbacktrace)
+all-stageprofile-libbacktrace: configure-stageprofile-libbacktrace
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcpp && \
+       cd $(HOST_SUBDIR)/libbacktrace && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -20034,40 +20469,38 @@ all-stageprofile-libcpp: configure-stageprofile-libcpp
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-libcpp)
+               $(TARGET-stageprofile-libbacktrace)
 
-maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
-clean-stageprofile: clean-stageprofile-libcpp
-clean-stageprofile-libcpp:
+maybe-clean-stageprofile-libbacktrace: clean-stageprofile-libbacktrace
+clean-stageprofile: clean-stageprofile-libbacktrace
+clean-stageprofile-libbacktrace:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-libbacktrace/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
-.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
-maybe-all-stagefeedback-libcpp:
-maybe-clean-stagefeedback-libcpp:
-@if libcpp-bootstrap
-maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
-all-stagefeedback: all-stagefeedback-libcpp
-TARGET-stagefeedback-libcpp = $(TARGET-libcpp)
-all-stagefeedback-libcpp: configure-stagefeedback-libcpp
+       cd $(HOST_SUBDIR)/libbacktrace && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libbacktrace-bootstrap
+
+
+.PHONY: all-stagefeedback-libbacktrace maybe-all-stagefeedback-libbacktrace
+.PHONY: clean-stagefeedback-libbacktrace maybe-clean-stagefeedback-libbacktrace
+maybe-all-stagefeedback-libbacktrace:
+maybe-clean-stagefeedback-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-all-stagefeedback-libbacktrace: all-stagefeedback-libbacktrace
+all-stagefeedback: all-stagefeedback-libbacktrace
+TARGET-stagefeedback-libbacktrace = $(TARGET-libbacktrace)
+all-stagefeedback-libbacktrace: configure-stagefeedback-libbacktrace
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcpp && \
+       cd $(HOST_SUBDIR)/libbacktrace && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -20077,90 +20510,88 @@ all-stagefeedback-libcpp: configure-stagefeedback-libcpp
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-libcpp)
+               $(TARGET-stagefeedback-libbacktrace)
 
-maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
-clean-stagefeedback: clean-stagefeedback-libcpp
-clean-stagefeedback-libcpp:
+maybe-clean-stagefeedback-libbacktrace: clean-stagefeedback-libbacktrace
+clean-stagefeedback: clean-stagefeedback-libbacktrace
+clean-stagefeedback-libbacktrace:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libbacktrace/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libcpp-bootstrap
+       cd $(HOST_SUBDIR)/libbacktrace && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libbacktrace-bootstrap
 
 
 
 
 
-.PHONY: check-libcpp maybe-check-libcpp
-maybe-check-libcpp:
-@if libcpp
-maybe-check-libcpp: check-libcpp
+.PHONY: check-libbacktrace maybe-check-libbacktrace
+maybe-check-libbacktrace:
+@if libbacktrace
+maybe-check-libbacktrace: check-libbacktrace
 
-check-libcpp:
+check-libbacktrace:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: install-libcpp maybe-install-libcpp
-maybe-install-libcpp:
-@if libcpp
-maybe-install-libcpp: install-libcpp
+.PHONY: install-libbacktrace maybe-install-libbacktrace
+maybe-install-libbacktrace:
+@if libbacktrace
+maybe-install-libbacktrace: install-libbacktrace
 
-install-libcpp: installdirs
+install-libbacktrace: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: install-strip-libcpp maybe-install-strip-libcpp
-maybe-install-strip-libcpp:
-@if libcpp
-maybe-install-strip-libcpp: install-strip-libcpp
+.PHONY: install-strip-libbacktrace maybe-install-strip-libbacktrace
+maybe-install-strip-libbacktrace:
+@if libbacktrace
+maybe-install-strip-libbacktrace: install-strip-libbacktrace
 
-install-strip-libcpp: installdirs
+install-strip-libbacktrace: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif libcpp
+@endif libbacktrace
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-libcpp info-libcpp
-maybe-info-libcpp:
-@if libcpp
-maybe-info-libcpp: info-libcpp
+.PHONY: maybe-info-libbacktrace info-libbacktrace
+maybe-info-libbacktrace:
+@if libbacktrace
+maybe-info-libbacktrace: info-libbacktrace
 
-info-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+info-libbacktrace: \
+    configure-libbacktrace 
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing info in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20168,24 +20599,24 @@ info-libcpp: \
                  info) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: maybe-dvi-libcpp dvi-libcpp
-maybe-dvi-libcpp:
-@if libcpp
-maybe-dvi-libcpp: dvi-libcpp
+.PHONY: maybe-dvi-libbacktrace dvi-libbacktrace
+maybe-dvi-libbacktrace:
+@if libbacktrace
+maybe-dvi-libbacktrace: dvi-libbacktrace
 
-dvi-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+dvi-libbacktrace: \
+    configure-libbacktrace 
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing dvi in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20193,24 +20624,24 @@ dvi-libcpp: \
                  dvi) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: maybe-pdf-libcpp pdf-libcpp
-maybe-pdf-libcpp:
-@if libcpp
-maybe-pdf-libcpp: pdf-libcpp
+.PHONY: maybe-pdf-libbacktrace pdf-libbacktrace
+maybe-pdf-libbacktrace:
+@if libbacktrace
+maybe-pdf-libbacktrace: pdf-libbacktrace
 
-pdf-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+pdf-libbacktrace: \
+    configure-libbacktrace 
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing pdf in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20218,24 +20649,24 @@ pdf-libcpp: \
                  pdf) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: maybe-html-libcpp html-libcpp
-maybe-html-libcpp:
-@if libcpp
-maybe-html-libcpp: html-libcpp
+.PHONY: maybe-html-libbacktrace html-libbacktrace
+maybe-html-libbacktrace:
+@if libbacktrace
+maybe-html-libbacktrace: html-libbacktrace
 
-html-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+html-libbacktrace: \
+    configure-libbacktrace 
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing html in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20243,24 +20674,24 @@ html-libcpp: \
                  html) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: maybe-TAGS-libcpp TAGS-libcpp
-maybe-TAGS-libcpp:
-@if libcpp
-maybe-TAGS-libcpp: TAGS-libcpp
+.PHONY: maybe-TAGS-libbacktrace TAGS-libbacktrace
+maybe-TAGS-libbacktrace:
+@if libbacktrace
+maybe-TAGS-libbacktrace: TAGS-libbacktrace
 
-TAGS-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+TAGS-libbacktrace: \
+    configure-libbacktrace 
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing TAGS in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20268,25 +20699,25 @@ TAGS-libcpp: \
                  TAGS) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: maybe-install-info-libcpp install-info-libcpp
-maybe-install-info-libcpp:
-@if libcpp
-maybe-install-info-libcpp: install-info-libcpp
+.PHONY: maybe-install-info-libbacktrace install-info-libbacktrace
+maybe-install-info-libbacktrace:
+@if libbacktrace
+maybe-install-info-libbacktrace: install-info-libbacktrace
 
-install-info-libcpp: \
-    configure-libcpp \
-    info-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+install-info-libbacktrace: \
+    configure-libbacktrace \
+    info-libbacktrace 
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing install-info in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20294,25 +20725,25 @@ install-info-libcpp: \
                  install-info) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: maybe-install-pdf-libcpp install-pdf-libcpp
-maybe-install-pdf-libcpp:
-@if libcpp
-maybe-install-pdf-libcpp: install-pdf-libcpp
+.PHONY: maybe-install-pdf-libbacktrace install-pdf-libbacktrace
+maybe-install-pdf-libbacktrace:
+@if libbacktrace
+maybe-install-pdf-libbacktrace: install-pdf-libbacktrace
 
-install-pdf-libcpp: \
-    configure-libcpp \
-    pdf-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+install-pdf-libbacktrace: \
+    configure-libbacktrace \
+    pdf-libbacktrace 
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing install-pdf in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20320,25 +20751,25 @@ install-pdf-libcpp: \
                  install-pdf) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: maybe-install-html-libcpp install-html-libcpp
-maybe-install-html-libcpp:
-@if libcpp
-maybe-install-html-libcpp: install-html-libcpp
+.PHONY: maybe-install-html-libbacktrace install-html-libbacktrace
+maybe-install-html-libbacktrace:
+@if libbacktrace
+maybe-install-html-libbacktrace: install-html-libbacktrace
 
-install-html-libcpp: \
-    configure-libcpp \
-    html-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+install-html-libbacktrace: \
+    configure-libbacktrace \
+    html-libbacktrace 
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing install-html in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20346,24 +20777,24 @@ install-html-libcpp: \
                  install-html) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: maybe-installcheck-libcpp installcheck-libcpp
-maybe-installcheck-libcpp:
-@if libcpp
-maybe-installcheck-libcpp: installcheck-libcpp
+.PHONY: maybe-installcheck-libbacktrace installcheck-libbacktrace
+maybe-installcheck-libbacktrace:
+@if libbacktrace
+maybe-installcheck-libbacktrace: installcheck-libbacktrace
 
-installcheck-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+installcheck-libbacktrace: \
+    configure-libbacktrace 
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing installcheck in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20371,23 +20802,23 @@ installcheck-libcpp: \
                  installcheck) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: maybe-mostlyclean-libcpp mostlyclean-libcpp
-maybe-mostlyclean-libcpp:
-@if libcpp
-maybe-mostlyclean-libcpp: mostlyclean-libcpp
+.PHONY: maybe-mostlyclean-libbacktrace mostlyclean-libbacktrace
+maybe-mostlyclean-libbacktrace:
+@if libbacktrace
+maybe-mostlyclean-libbacktrace: mostlyclean-libbacktrace
 
-mostlyclean-libcpp
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+mostlyclean-libbacktrace
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing mostlyclean in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20395,23 +20826,23 @@ mostlyclean-libcpp:
                  mostlyclean) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: maybe-clean-libcpp clean-libcpp
-maybe-clean-libcpp:
-@if libcpp
-maybe-clean-libcpp: clean-libcpp
+.PHONY: maybe-clean-libbacktrace clean-libbacktrace
+maybe-clean-libbacktrace:
+@if libbacktrace
+maybe-clean-libbacktrace: clean-libbacktrace
 
-clean-libcpp
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+clean-libbacktrace
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing clean in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20419,23 +20850,23 @@ clean-libcpp:
                  clean) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: maybe-distclean-libcpp distclean-libcpp
-maybe-distclean-libcpp:
-@if libcpp
-maybe-distclean-libcpp: distclean-libcpp
+.PHONY: maybe-distclean-libbacktrace distclean-libbacktrace
+maybe-distclean-libbacktrace:
+@if libbacktrace
+maybe-distclean-libbacktrace: distclean-libbacktrace
 
-distclean-libcpp
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+distclean-libbacktrace
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing distclean in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20443,23 +20874,23 @@ distclean-libcpp:
                  distclean) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
-.PHONY: maybe-maintainer-clean-libcpp maintainer-clean-libcpp
-maybe-maintainer-clean-libcpp:
-@if libcpp
-maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
+.PHONY: maybe-maintainer-clean-libbacktrace maintainer-clean-libbacktrace
+maybe-maintainer-clean-libbacktrace:
+@if libbacktrace
+maybe-maintainer-clean-libbacktrace: maintainer-clean-libbacktrace
 
-maintainer-clean-libcpp
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+maintainer-clean-libbacktrace
+       @[ -f ./libbacktrace/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing maintainer-clean in libbacktrace" ; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20467,274 +20898,276 @@ maintainer-clean-libcpp:
                  maintainer-clean) \
          || exit 1
 
-@endif libcpp
+@endif libbacktrace
 
 
 
-.PHONY: configure-libdecnumber maybe-configure-libdecnumber
-maybe-configure-libdecnumber:
+.PHONY: configure-libcpp maybe-configure-libcpp
+maybe-configure-libcpp:
 @if gcc-bootstrap
-configure-libdecnumber: stage_current
+configure-libcpp: stage_current
 @endif gcc-bootstrap
-@if libdecnumber
-maybe-configure-libdecnumber: configure-libdecnumber
-configure-libdecnumber
+@if libcpp
+maybe-configure-libcpp: configure-libcpp
+configure-libcpp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
-       cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libcpp; \
+       cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
-@endif libdecnumber
+@endif libcpp
 
 
 
-.PHONY: configure-stage1-libdecnumber maybe-configure-stage1-libdecnumber
-maybe-configure-stage1-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage1-libdecnumber: configure-stage1-libdecnumber
-configure-stage1-libdecnumber:
+.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
+maybe-configure-stage1-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage1-libcpp: configure-stage1-libcpp
+configure-stage1-libcpp:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libcpp/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)/libdecnumber ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
+@endif libcpp-bootstrap
 
-.PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber
-maybe-configure-stage2-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage2-libdecnumber: configure-stage2-libdecnumber
-configure-stage2-libdecnumber:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-       @r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
+maybe-configure-stage2-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage2-libcpp: configure-stage2-libcpp
+configure-stage2-libcpp:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libcpp/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)/libdecnumber ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
+@endif libcpp-bootstrap
 
-.PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber
-maybe-configure-stage3-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage3-libdecnumber: configure-stage3-libdecnumber
-configure-stage3-libdecnumber:
+.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
+maybe-configure-stage3-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage3-libcpp: configure-stage3-libcpp
+configure-stage3-libcpp:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libcpp/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)/libdecnumber ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
+@endif libcpp-bootstrap
 
-.PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber
-maybe-configure-stage4-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage4-libdecnumber: configure-stage4-libdecnumber
-configure-stage4-libdecnumber:
+.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
+maybe-configure-stage4-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage4-libcpp: configure-stage4-libcpp
+configure-stage4-libcpp:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libcpp/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)/libdecnumber ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
+@endif libcpp-bootstrap
 
-.PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber
-maybe-configure-stageprofile-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
-configure-stageprofile-libdecnumber:
+.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
+maybe-configure-stageprofile-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
+configure-stageprofile-libcpp:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libcpp/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)/libdecnumber ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
+@endif libcpp-bootstrap
 
-.PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber
-maybe-configure-stagefeedback-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
-configure-stagefeedback-libdecnumber:
+.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
+maybe-configure-stagefeedback-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
+configure-stagefeedback-libcpp:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libcpp/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)/libdecnumber ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
+@endif libcpp-bootstrap
 
 
 
 
 
-.PHONY: all-libdecnumber maybe-all-libdecnumber
-maybe-all-libdecnumber:
+.PHONY: all-libcpp maybe-all-libcpp
+maybe-all-libcpp:
 @if gcc-bootstrap
-all-libdecnumber: stage_current
+all-libcpp: stage_current
 @endif gcc-bootstrap
-@if libdecnumber
-TARGET-libdecnumber=all
-maybe-all-libdecnumber: all-libdecnumber
-all-libdecnumber: configure-libdecnumber
+@if libcpp
+TARGET-libcpp=all
+maybe-all-libcpp: all-libcpp
+all-libcpp: configure-libcpp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libdecnumber))
-@endif libdecnumber
+       (cd $(HOST_SUBDIR)/libcpp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libcpp))
+@endif libcpp
 
 
 
-.PHONY: all-stage1-libdecnumber maybe-all-stage1-libdecnumber
-.PHONY: clean-stage1-libdecnumber maybe-clean-stage1-libdecnumber
-maybe-all-stage1-libdecnumber:
-maybe-clean-stage1-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage1-libdecnumber: all-stage1-libdecnumber
-all-stage1: all-stage1-libdecnumber
-TARGET-stage1-libdecnumber = $(TARGET-libdecnumber)
-all-stage1-libdecnumber: configure-stage1-libdecnumber
+.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
+.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
+maybe-all-stage1-libcpp:
+maybe-clean-stage1-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage1-libcpp: all-stage1-libcpp
+all-stage1: all-stage1-libcpp
+TARGET-stage1-libcpp = $(TARGET-libcpp)
+all-stage1-libcpp: configure-stage1-libcpp
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
        $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -20742,41 +21175,42 @@ all-stage1-libdecnumber: configure-stage1-libdecnumber
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-libdecnumber)
+               $(TARGET-stage1-libcpp)
 
-maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
-clean-stage1: clean-stage1-libdecnumber
-clean-stage1-libdecnumber:
+maybe-clean-stage1-libcpp: clean-stage1-libcpp
+clean-stage1: clean-stage1-libcpp
+clean-stage1-libcpp:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif libdecnumber-bootstrap
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libcpp-bootstrap
 
 
-.PHONY: all-stage2-libdecnumber maybe-all-stage2-libdecnumber
-.PHONY: clean-stage2-libdecnumber maybe-clean-stage2-libdecnumber
-maybe-all-stage2-libdecnumber:
-maybe-clean-stage2-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage2-libdecnumber: all-stage2-libdecnumber
-all-stage2: all-stage2-libdecnumber
-TARGET-stage2-libdecnumber = $(TARGET-libdecnumber)
-all-stage2-libdecnumber: configure-stage2-libdecnumber
+.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
+.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
+maybe-all-stage2-libcpp:
+maybe-clean-stage2-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage2-libcpp: all-stage2-libcpp
+all-stage2: all-stage2-libcpp
+TARGET-stage2-libcpp = $(TARGET-libcpp)
+all-stage2-libcpp: configure-stage2-libcpp
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -20786,40 +21220,38 @@ all-stage2-libdecnumber: configure-stage2-libdecnumber
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-libdecnumber)
+               $(TARGET-stage2-libcpp)
 
-maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
-clean-stage2: clean-stage2-libdecnumber
-clean-stage2-libdecnumber:
+maybe-clean-stage2-libcpp: clean-stage2-libcpp
+clean-stage2: clean-stage2-libcpp
+clean-stage2-libcpp:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libcpp-bootstrap
 
 
-.PHONY: all-stage3-libdecnumber maybe-all-stage3-libdecnumber
-.PHONY: clean-stage3-libdecnumber maybe-clean-stage3-libdecnumber
-maybe-all-stage3-libdecnumber:
-maybe-clean-stage3-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage3-libdecnumber: all-stage3-libdecnumber
-all-stage3: all-stage3-libdecnumber
-TARGET-stage3-libdecnumber = $(TARGET-libdecnumber)
-all-stage3-libdecnumber: configure-stage3-libdecnumber
+.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
+.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
+maybe-all-stage3-libcpp:
+maybe-clean-stage3-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage3-libcpp: all-stage3-libcpp
+all-stage3: all-stage3-libcpp
+TARGET-stage3-libcpp = $(TARGET-libcpp)
+all-stage3-libcpp: configure-stage3-libcpp
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -20829,40 +21261,38 @@ all-stage3-libdecnumber: configure-stage3-libdecnumber
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-libdecnumber)
+               $(TARGET-stage3-libcpp)
 
-maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
-clean-stage3: clean-stage3-libdecnumber
-clean-stage3-libdecnumber:
+maybe-clean-stage3-libcpp: clean-stage3-libcpp
+clean-stage3: clean-stage3-libcpp
+clean-stage3-libcpp:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libcpp-bootstrap
 
 
-.PHONY: all-stage4-libdecnumber maybe-all-stage4-libdecnumber
-.PHONY: clean-stage4-libdecnumber maybe-clean-stage4-libdecnumber
-maybe-all-stage4-libdecnumber:
-maybe-clean-stage4-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage4-libdecnumber: all-stage4-libdecnumber
-all-stage4: all-stage4-libdecnumber
-TARGET-stage4-libdecnumber = $(TARGET-libdecnumber)
-all-stage4-libdecnumber: configure-stage4-libdecnumber
+.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
+.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
+maybe-all-stage4-libcpp:
+maybe-clean-stage4-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage4-libcpp: all-stage4-libcpp
+all-stage4: all-stage4-libcpp
+TARGET-stage4-libcpp = $(TARGET-libcpp)
+all-stage4-libcpp: configure-stage4-libcpp
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -20872,40 +21302,38 @@ all-stage4-libdecnumber: configure-stage4-libdecnumber
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-libdecnumber)
+               $(TARGET-stage4-libcpp)
 
-maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
-clean-stage4: clean-stage4-libdecnumber
-clean-stage4-libdecnumber:
+maybe-clean-stage4-libcpp: clean-stage4-libcpp
+clean-stage4: clean-stage4-libcpp
+clean-stage4-libcpp:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libcpp-bootstrap
 
 
-.PHONY: all-stageprofile-libdecnumber maybe-all-stageprofile-libdecnumber
-.PHONY: clean-stageprofile-libdecnumber maybe-clean-stageprofile-libdecnumber
-maybe-all-stageprofile-libdecnumber:
-maybe-clean-stageprofile-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stageprofile-libdecnumber: all-stageprofile-libdecnumber
-all-stageprofile: all-stageprofile-libdecnumber
-TARGET-stageprofile-libdecnumber = $(TARGET-libdecnumber)
-all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
+.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
+.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
+maybe-all-stageprofile-libcpp:
+maybe-clean-stageprofile-libcpp:
+@if libcpp-bootstrap
+maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
+all-stageprofile: all-stageprofile-libcpp
+TARGET-stageprofile-libcpp = $(TARGET-libcpp)
+all-stageprofile-libcpp: configure-stageprofile-libcpp
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -20915,40 +21343,38 @@ all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-libdecnumber)
+               $(TARGET-stageprofile-libcpp)
 
-maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
-clean-stageprofile: clean-stageprofile-libdecnumber
-clean-stageprofile-libdecnumber:
+maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
+clean-stageprofile: clean-stageprofile-libcpp
+clean-stageprofile-libcpp:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libcpp-bootstrap
 
 
-.PHONY: all-stagefeedback-libdecnumber maybe-all-stagefeedback-libdecnumber
-.PHONY: clean-stagefeedback-libdecnumber maybe-clean-stagefeedback-libdecnumber
-maybe-all-stagefeedback-libdecnumber:
-maybe-clean-stagefeedback-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stagefeedback-libdecnumber: all-stagefeedback-libdecnumber
-all-stagefeedback: all-stagefeedback-libdecnumber
-TARGET-stagefeedback-libdecnumber = $(TARGET-libdecnumber)
-all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
+.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
+.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
+maybe-all-stagefeedback-libcpp:
+maybe-clean-stagefeedback-libcpp:
+@if libcpp-bootstrap
+maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
+all-stagefeedback: all-stagefeedback-libcpp
+TARGET-stagefeedback-libcpp = $(TARGET-libcpp)
+all-stagefeedback-libcpp: configure-stagefeedback-libcpp
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -20958,90 +21384,88 @@ all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-libdecnumber)
+               $(TARGET-stagefeedback-libcpp)
 
-maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
-clean-stagefeedback: clean-stagefeedback-libdecnumber
-clean-stagefeedback-libdecnumber:
+maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
+clean-stagefeedback: clean-stagefeedback-libcpp
+clean-stagefeedback-libcpp:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libcpp-bootstrap
 
 
 
 
 
-.PHONY: check-libdecnumber maybe-check-libdecnumber
-maybe-check-libdecnumber:
-@if libdecnumber
-maybe-check-libdecnumber: check-libdecnumber
+.PHONY: check-libcpp maybe-check-libcpp
+maybe-check-libcpp:
+@if libcpp
+maybe-check-libcpp: check-libcpp
 
-check-libdecnumber:
+check-libcpp:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: install-libdecnumber maybe-install-libdecnumber
-maybe-install-libdecnumber:
-@if libdecnumber
-maybe-install-libdecnumber: install-libdecnumber
+.PHONY: install-libcpp maybe-install-libcpp
+maybe-install-libcpp:
+@if libcpp
+maybe-install-libcpp: install-libcpp
 
-install-libdecnumber: installdirs
+install-libcpp: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: install-strip-libdecnumber maybe-install-strip-libdecnumber
-maybe-install-strip-libdecnumber:
-@if libdecnumber
-maybe-install-strip-libdecnumber: install-strip-libdecnumber
+.PHONY: install-strip-libcpp maybe-install-strip-libcpp
+maybe-install-strip-libcpp:
+@if libcpp
+maybe-install-strip-libcpp: install-strip-libcpp
 
-install-strip-libdecnumber: installdirs
+install-strip-libcpp: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif libdecnumber
+@endif libcpp
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-libdecnumber info-libdecnumber
-maybe-info-libdecnumber:
-@if libdecnumber
-maybe-info-libdecnumber: info-libdecnumber
+.PHONY: maybe-info-libcpp info-libcpp
+maybe-info-libcpp:
+@if libcpp
+maybe-info-libcpp: info-libcpp
 
-info-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+info-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing info in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21049,24 +21473,24 @@ info-libdecnumber: \
                  info) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: maybe-dvi-libdecnumber dvi-libdecnumber
-maybe-dvi-libdecnumber:
-@if libdecnumber
-maybe-dvi-libdecnumber: dvi-libdecnumber
+.PHONY: maybe-dvi-libcpp dvi-libcpp
+maybe-dvi-libcpp:
+@if libcpp
+maybe-dvi-libcpp: dvi-libcpp
 
-dvi-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+dvi-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing dvi in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21074,24 +21498,24 @@ dvi-libdecnumber: \
                  dvi) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: maybe-pdf-libdecnumber pdf-libdecnumber
-maybe-pdf-libdecnumber:
-@if libdecnumber
-maybe-pdf-libdecnumber: pdf-libdecnumber
+.PHONY: maybe-pdf-libcpp pdf-libcpp
+maybe-pdf-libcpp:
+@if libcpp
+maybe-pdf-libcpp: pdf-libcpp
 
-pdf-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+pdf-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing pdf in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21099,24 +21523,24 @@ pdf-libdecnumber: \
                  pdf) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: maybe-html-libdecnumber html-libdecnumber
-maybe-html-libdecnumber:
-@if libdecnumber
-maybe-html-libdecnumber: html-libdecnumber
+.PHONY: maybe-html-libcpp html-libcpp
+maybe-html-libcpp:
+@if libcpp
+maybe-html-libcpp: html-libcpp
 
-html-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+html-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing html in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21124,24 +21548,24 @@ html-libdecnumber: \
                  html) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: maybe-TAGS-libdecnumber TAGS-libdecnumber
-maybe-TAGS-libdecnumber:
-@if libdecnumber
-maybe-TAGS-libdecnumber: TAGS-libdecnumber
+.PHONY: maybe-TAGS-libcpp TAGS-libcpp
+maybe-TAGS-libcpp:
+@if libcpp
+maybe-TAGS-libcpp: TAGS-libcpp
 
-TAGS-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+TAGS-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing TAGS in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21149,25 +21573,25 @@ TAGS-libdecnumber: \
                  TAGS) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: maybe-install-info-libdecnumber install-info-libdecnumber
-maybe-install-info-libdecnumber:
-@if libdecnumber
-maybe-install-info-libdecnumber: install-info-libdecnumber
+.PHONY: maybe-install-info-libcpp install-info-libcpp
+maybe-install-info-libcpp:
+@if libcpp
+maybe-install-info-libcpp: install-info-libcpp
 
-install-info-libdecnumber: \
-    configure-libdecnumber \
-    info-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+install-info-libcpp: \
+    configure-libcpp \
+    info-libcpp 
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing install-info in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21175,25 +21599,25 @@ install-info-libdecnumber: \
                  install-info) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: maybe-install-pdf-libdecnumber install-pdf-libdecnumber
-maybe-install-pdf-libdecnumber:
-@if libdecnumber
-maybe-install-pdf-libdecnumber: install-pdf-libdecnumber
+.PHONY: maybe-install-pdf-libcpp install-pdf-libcpp
+maybe-install-pdf-libcpp:
+@if libcpp
+maybe-install-pdf-libcpp: install-pdf-libcpp
 
-install-pdf-libdecnumber: \
-    configure-libdecnumber \
-    pdf-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+install-pdf-libcpp: \
+    configure-libcpp \
+    pdf-libcpp 
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing install-pdf in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21201,25 +21625,25 @@ install-pdf-libdecnumber: \
                  install-pdf) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: maybe-install-html-libdecnumber install-html-libdecnumber
-maybe-install-html-libdecnumber:
-@if libdecnumber
-maybe-install-html-libdecnumber: install-html-libdecnumber
+.PHONY: maybe-install-html-libcpp install-html-libcpp
+maybe-install-html-libcpp:
+@if libcpp
+maybe-install-html-libcpp: install-html-libcpp
 
-install-html-libdecnumber: \
-    configure-libdecnumber \
-    html-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+install-html-libcpp: \
+    configure-libcpp \
+    html-libcpp 
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing install-html in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21227,24 +21651,24 @@ install-html-libdecnumber: \
                  install-html) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: maybe-installcheck-libdecnumber installcheck-libdecnumber
-maybe-installcheck-libdecnumber:
-@if libdecnumber
-maybe-installcheck-libdecnumber: installcheck-libdecnumber
+.PHONY: maybe-installcheck-libcpp installcheck-libcpp
+maybe-installcheck-libcpp:
+@if libcpp
+maybe-installcheck-libcpp: installcheck-libcpp
 
-installcheck-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+installcheck-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing installcheck in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21252,23 +21676,23 @@ installcheck-libdecnumber: \
                  installcheck) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: maybe-mostlyclean-libdecnumber mostlyclean-libdecnumber
-maybe-mostlyclean-libdecnumber:
-@if libdecnumber
-maybe-mostlyclean-libdecnumber: mostlyclean-libdecnumber
+.PHONY: maybe-mostlyclean-libcpp mostlyclean-libcpp
+maybe-mostlyclean-libcpp:
+@if libcpp
+maybe-mostlyclean-libcpp: mostlyclean-libcpp
 
-mostlyclean-libdecnumber
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+mostlyclean-libcpp
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing mostlyclean in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21276,23 +21700,23 @@ mostlyclean-libdecnumber:
                  mostlyclean) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: maybe-clean-libdecnumber clean-libdecnumber
-maybe-clean-libdecnumber:
-@if libdecnumber
-maybe-clean-libdecnumber: clean-libdecnumber
+.PHONY: maybe-clean-libcpp clean-libcpp
+maybe-clean-libcpp:
+@if libcpp
+maybe-clean-libcpp: clean-libcpp
 
-clean-libdecnumber
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+clean-libcpp
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing clean in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21300,23 +21724,23 @@ clean-libdecnumber:
                  clean) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: maybe-distclean-libdecnumber distclean-libdecnumber
-maybe-distclean-libdecnumber:
-@if libdecnumber
-maybe-distclean-libdecnumber: distclean-libdecnumber
+.PHONY: maybe-distclean-libcpp distclean-libcpp
+maybe-distclean-libcpp:
+@if libcpp
+maybe-distclean-libcpp: distclean-libcpp
 
-distclean-libdecnumber
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+distclean-libcpp
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing distclean in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21324,23 +21748,23 @@ distclean-libdecnumber:
                  distclean) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
-.PHONY: maybe-maintainer-clean-libdecnumber maintainer-clean-libdecnumber
-maybe-maintainer-clean-libdecnumber:
-@if libdecnumber
-maybe-maintainer-clean-libdecnumber: maintainer-clean-libdecnumber
+.PHONY: maybe-maintainer-clean-libcpp maintainer-clean-libcpp
+maybe-maintainer-clean-libcpp:
+@if libcpp
+maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
 
-maintainer-clean-libdecnumber
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+maintainer-clean-libcpp
+       @[ -f ./libcpp/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing maintainer-clean in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21348,483 +21772,1359 @@ maintainer-clean-libdecnumber:
                  maintainer-clean) \
          || exit 1
 
-@endif libdecnumber
+@endif libcpp
 
 
 
-.PHONY: configure-libgui maybe-configure-libgui
-maybe-configure-libgui:
+.PHONY: configure-libdecnumber maybe-configure-libdecnumber
+maybe-configure-libdecnumber:
 @if gcc-bootstrap
-configure-libgui: stage_current
+configure-libdecnumber: stage_current
 @endif gcc-bootstrap
-@if libgui
-maybe-configure-libgui: configure-libgui
-configure-libgui: 
-       @: $(MAKE); $(unstage)
+@if libdecnumber
+maybe-configure-libdecnumber: configure-libdecnumber
+configure-libdecnumber: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libgui; \
-       cd "$(HOST_SUBDIR)/libgui" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
+       cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgui"; \
-       libsrcdir="$$s/libgui"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libdecnumber; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
-@endif libgui
-
-
+@endif libdecnumber
 
 
 
-.PHONY: all-libgui maybe-all-libgui
-maybe-all-libgui:
-@if gcc-bootstrap
-all-libgui: stage_current
-@endif gcc-bootstrap
-@if libgui
-TARGET-libgui=all
-maybe-all-libgui: all-libgui
-all-libgui: configure-libgui
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage1-libdecnumber maybe-configure-stage1-libdecnumber
+maybe-configure-stage1-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage1-libdecnumber: configure-stage1-libdecnumber
+configure-stage1-libdecnumber:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/libgui && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libgui))
-@endif libgui
-
-
-
-
-.PHONY: check-libgui maybe-check-libgui
-maybe-check-libgui:
-@if libgui
-maybe-check-libgui: check-libgui
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/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)/libdecnumber ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libdecnumber; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-check-libgui:
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber
+maybe-configure-stage2-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage2-libdecnumber: configure-stage2-libdecnumber
+configure-stage2-libdecnumber:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libgui && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif libgui
-
-.PHONY: install-libgui maybe-install-libgui
-maybe-install-libgui:
-@if libgui
-maybe-install-libgui: install-libgui
+       $(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)/libdecnumber ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libdecnumber; \
+       $(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)  \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-install-libgui: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber
+maybe-configure-stage3-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage3-libdecnumber: configure-stage3-libdecnumber
+configure-stage3-libdecnumber:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libgui && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif libgui
-
-.PHONY: install-strip-libgui maybe-install-strip-libgui
-maybe-install-strip-libgui:
-@if libgui
-maybe-install-strip-libgui: install-strip-libgui
+       $(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)/libdecnumber ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libdecnumber; \
+       $(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 libdecnumber-bootstrap
 
-install-strip-libgui: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber
+maybe-configure-stage4-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage4-libdecnumber: configure-stage4-libdecnumber
+configure-stage4-libdecnumber:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libgui && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif libgui
-
-# Other targets (info, dvi, pdf, etc.)
+       $(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)/libdecnumber ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libdecnumber; \
+       $(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)  \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-.PHONY: maybe-info-libgui info-libgui
-maybe-info-libgui:
-@if libgui
-maybe-info-libgui: info-libgui
+.PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber
+maybe-configure-stageprofile-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
+configure-stageprofile-libdecnumber:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libdecnumber; \
+       $(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)  \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-info-libgui: \
-    configure-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber
+maybe-configure-stagefeedback-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
+configure-stagefeedback-libdecnumber:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing info in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
-         $(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
+       $(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)/libdecnumber ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libdecnumber; \
+       $(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)  \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-@endif libgui
 
-.PHONY: maybe-dvi-libgui dvi-libgui
-maybe-dvi-libgui:
-@if libgui
-maybe-dvi-libgui: dvi-libgui
 
-dvi-libgui: \
-    configure-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+
+
+.PHONY: all-libdecnumber maybe-all-libdecnumber
+maybe-all-libdecnumber:
+@if gcc-bootstrap
+all-libdecnumber: stage_current
+@endif gcc-bootstrap
+@if libdecnumber
+TARGET-libdecnumber=all
+maybe-all-libdecnumber: all-libdecnumber
+all-libdecnumber: configure-libdecnumber
+       @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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
-         $(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
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libdecnumber))
+@endif libdecnumber
 
-@endif libgui
 
-.PHONY: maybe-pdf-libgui pdf-libgui
-maybe-pdf-libgui:
-@if libgui
-maybe-pdf-libgui: pdf-libgui
 
-pdf-libgui: \
-    configure-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage1-libdecnumber maybe-all-stage1-libdecnumber
+.PHONY: clean-stage1-libdecnumber maybe-clean-stage1-libdecnumber
+maybe-all-stage1-libdecnumber:
+maybe-clean-stage1-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage1-libdecnumber: all-stage1-libdecnumber
+all-stage1: all-stage1-libdecnumber
+TARGET-stage1-libdecnumber = $(TARGET-libdecnumber)
+all-stage1-libdecnumber: configure-stage1-libdecnumber
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
-         $(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
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_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_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-libdecnumber)
 
-@endif libgui
+maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
+clean-stage1: clean-stage1-libdecnumber
+clean-stage1-libdecnumber:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libdecnumber-bootstrap
 
-.PHONY: maybe-html-libgui html-libgui
-maybe-html-libgui:
-@if libgui
-maybe-html-libgui: html-libgui
 
-html-libgui: \
-    configure-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage2-libdecnumber maybe-all-stage2-libdecnumber
+.PHONY: clean-stage2-libdecnumber maybe-clean-stage2-libdecnumber
+maybe-all-stage2-libdecnumber:
+maybe-clean-stage2-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage2-libdecnumber: all-stage2-libdecnumber
+all-stage2: all-stage2-libdecnumber
+TARGET-stage2-libdecnumber = $(TARGET-libdecnumber)
+all-stage2-libdecnumber: configure-stage2-libdecnumber
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE2_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE2_TFLAGS)" \
+               $(TARGET-stage2-libdecnumber)
+
+maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
+clean-stage2: clean-stage2-libdecnumber
+clean-stage2-libdecnumber:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stage3-libdecnumber maybe-all-stage3-libdecnumber
+.PHONY: clean-stage3-libdecnumber maybe-clean-stage3-libdecnumber
+maybe-all-stage3-libdecnumber:
+maybe-clean-stage3-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage3-libdecnumber: all-stage3-libdecnumber
+all-stage3: all-stage3-libdecnumber
+TARGET-stage3-libdecnumber = $(TARGET-libdecnumber)
+all-stage3-libdecnumber: configure-stage3-libdecnumber
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE3_CFLAGS)" \
+               CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE3_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE3_TFLAGS)" \
+               $(TARGET-stage3-libdecnumber)
+
+maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
+clean-stage3: clean-stage3-libdecnumber
+clean-stage3-libdecnumber:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stage4-libdecnumber maybe-all-stage4-libdecnumber
+.PHONY: clean-stage4-libdecnumber maybe-clean-stage4-libdecnumber
+maybe-all-stage4-libdecnumber:
+maybe-clean-stage4-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage4-libdecnumber: all-stage4-libdecnumber
+all-stage4: all-stage4-libdecnumber
+TARGET-stage4-libdecnumber = $(TARGET-libdecnumber)
+all-stage4-libdecnumber: configure-stage4-libdecnumber
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE4_TFLAGS)" \
+               $(TARGET-stage4-libdecnumber)
+
+maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
+clean-stage4: clean-stage4-libdecnumber
+clean-stage4-libdecnumber:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stageprofile-libdecnumber maybe-all-stageprofile-libdecnumber
+.PHONY: clean-stageprofile-libdecnumber maybe-clean-stageprofile-libdecnumber
+maybe-all-stageprofile-libdecnumber:
+maybe-clean-stageprofile-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stageprofile-libdecnumber: all-stageprofile-libdecnumber
+all-stageprofile: all-stageprofile-libdecnumber
+TARGET-stageprofile-libdecnumber = $(TARGET-libdecnumber)
+all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEprofile_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               $(TARGET-stageprofile-libdecnumber)
+
+maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
+clean-stageprofile: clean-stageprofile-libdecnumber
+clean-stageprofile-libdecnumber:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stagefeedback-libdecnumber maybe-all-stagefeedback-libdecnumber
+.PHONY: clean-stagefeedback-libdecnumber maybe-clean-stagefeedback-libdecnumber
+maybe-all-stagefeedback-libdecnumber:
+maybe-clean-stagefeedback-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stagefeedback-libdecnumber: all-stagefeedback-libdecnumber
+all-stagefeedback: all-stagefeedback-libdecnumber
+TARGET-stagefeedback-libdecnumber = $(TARGET-libdecnumber)
+all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEfeedback_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               $(TARGET-stagefeedback-libdecnumber)
+
+maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
+clean-stagefeedback: clean-stagefeedback-libdecnumber
+clean-stagefeedback-libdecnumber:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libdecnumber-bootstrap
+
+
+
+
+
+.PHONY: check-libdecnumber maybe-check-libdecnumber
+maybe-check-libdecnumber:
+@if libdecnumber
+maybe-check-libdecnumber: check-libdecnumber
+
+check-libdecnumber:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif libdecnumber
+
+.PHONY: install-libdecnumber maybe-install-libdecnumber
+maybe-install-libdecnumber:
+@if libdecnumber
+maybe-install-libdecnumber: install-libdecnumber
+
+install-libdecnumber: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif libdecnumber
+
+.PHONY: install-strip-libdecnumber maybe-install-strip-libdecnumber
+maybe-install-strip-libdecnumber:
+@if libdecnumber
+maybe-install-strip-libdecnumber: install-strip-libdecnumber
+
+install-strip-libdecnumber: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif libdecnumber
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libdecnumber info-libdecnumber
+maybe-info-libdecnumber:
+@if libdecnumber
+maybe-info-libdecnumber: info-libdecnumber
+
+info-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing info in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(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) \
+                 info) \
          || exit 1
 
-@endif libgui
+@endif libdecnumber
 
-.PHONY: maybe-TAGS-libgui TAGS-libgui
-maybe-TAGS-libgui:
-@if libgui
-maybe-TAGS-libgui: TAGS-libgui
+.PHONY: maybe-dvi-libdecnumber dvi-libdecnumber
+maybe-dvi-libdecnumber:
+@if libdecnumber
+maybe-dvi-libdecnumber: dvi-libdecnumber
 
-TAGS-libgui: \
-    configure-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+dvi-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing dvi in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(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) \
+                 dvi) \
          || exit 1
 
-@endif libgui
+@endif libdecnumber
 
-.PHONY: maybe-install-info-libgui install-info-libgui
-maybe-install-info-libgui:
-@if libgui
-maybe-install-info-libgui: install-info-libgui
+.PHONY: maybe-pdf-libdecnumber pdf-libdecnumber
+maybe-pdf-libdecnumber:
+@if libdecnumber
+maybe-pdf-libdecnumber: pdf-libdecnumber
 
-install-info-libgui: \
-    configure-libgui \
-    info-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+pdf-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing pdf in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(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) \
+                 pdf) \
          || exit 1
 
-@endif libgui
+@endif libdecnumber
 
-.PHONY: maybe-install-pdf-libgui install-pdf-libgui
-maybe-install-pdf-libgui:
-@if libgui
-maybe-install-pdf-libgui: install-pdf-libgui
+.PHONY: maybe-html-libdecnumber html-libdecnumber
+maybe-html-libdecnumber:
+@if libdecnumber
+maybe-html-libdecnumber: html-libdecnumber
 
-install-pdf-libgui: \
-    configure-libgui \
-    pdf-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+html-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing html in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(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) \
+                 html) \
          || exit 1
 
-@endif libgui
+@endif libdecnumber
 
-.PHONY: maybe-install-html-libgui install-html-libgui
-maybe-install-html-libgui:
-@if libgui
-maybe-install-html-libgui: install-html-libgui
+.PHONY: maybe-TAGS-libdecnumber TAGS-libdecnumber
+maybe-TAGS-libdecnumber:
+@if libdecnumber
+maybe-TAGS-libdecnumber: TAGS-libdecnumber
 
-install-html-libgui: \
-    configure-libgui \
-    html-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+TAGS-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing TAGS in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(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) \
+                 TAGS) \
          || exit 1
 
-@endif libgui
+@endif libdecnumber
 
-.PHONY: maybe-installcheck-libgui installcheck-libgui
-maybe-installcheck-libgui:
-@if libgui
-maybe-installcheck-libgui: installcheck-libgui
+.PHONY: maybe-install-info-libdecnumber install-info-libdecnumber
+maybe-install-info-libdecnumber:
+@if libdecnumber
+maybe-install-info-libdecnumber: install-info-libdecnumber
 
-installcheck-libgui: \
-    configure-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+install-info-libdecnumber: \
+    configure-libdecnumber \
+    info-libdecnumber 
+       @[ -f ./libdecnumber/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing install-info in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(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) \
+                 install-info) \
          || exit 1
 
-@endif libgui
+@endif libdecnumber
 
-.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
-maybe-mostlyclean-libgui:
-@if libgui
-maybe-mostlyclean-libgui: mostlyclean-libgui
+.PHONY: maybe-install-pdf-libdecnumber install-pdf-libdecnumber
+maybe-install-pdf-libdecnumber:
+@if libdecnumber
+maybe-install-pdf-libdecnumber: install-pdf-libdecnumber
 
-mostlyclean-libgui: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+install-pdf-libdecnumber: \
+    configure-libdecnumber \
+    pdf-libdecnumber 
+       @[ -f ./libdecnumber/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing install-pdf in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(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) \
+                 install-pdf) \
          || exit 1
 
-@endif libgui
+@endif libdecnumber
 
-.PHONY: maybe-clean-libgui clean-libgui
-maybe-clean-libgui:
-@if libgui
-maybe-clean-libgui: clean-libgui
+.PHONY: maybe-install-html-libdecnumber install-html-libdecnumber
+maybe-install-html-libdecnumber:
+@if libdecnumber
+maybe-install-html-libdecnumber: install-html-libdecnumber
 
-clean-libgui: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+install-html-libdecnumber: \
+    configure-libdecnumber \
+    html-libdecnumber 
+       @[ -f ./libdecnumber/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing install-html in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(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) \
+                 install-html) \
          || exit 1
 
-@endif libgui
+@endif libdecnumber
 
-.PHONY: maybe-distclean-libgui distclean-libgui
-maybe-distclean-libgui:
-@if libgui
-maybe-distclean-libgui: distclean-libgui
+.PHONY: maybe-installcheck-libdecnumber installcheck-libdecnumber
+maybe-installcheck-libdecnumber:
+@if libdecnumber
+maybe-installcheck-libdecnumber: installcheck-libdecnumber
 
-distclean-libgui: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+installcheck-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing installcheck in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(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) \
+                 installcheck) \
          || exit 1
 
-@endif libgui
+@endif libdecnumber
 
-.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
-maybe-maintainer-clean-libgui:
-@if libgui
-maybe-maintainer-clean-libgui: maintainer-clean-libgui
+.PHONY: maybe-mostlyclean-libdecnumber mostlyclean-libdecnumber
+maybe-mostlyclean-libdecnumber:
+@if libdecnumber
+maybe-mostlyclean-libdecnumber: mostlyclean-libdecnumber
 
-maintainer-clean-libgui: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+mostlyclean-libdecnumber: 
+       @[ -f ./libdecnumber/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing mostlyclean in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(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) \
+                 mostlyclean) \
          || exit 1
 
-@endif libgui
-
+@endif libdecnumber
 
+.PHONY: maybe-clean-libdecnumber clean-libdecnumber
+maybe-clean-libdecnumber:
+@if libdecnumber
+maybe-clean-libdecnumber: clean-libdecnumber
 
-.PHONY: configure-libiberty maybe-configure-libiberty
-maybe-configure-libiberty:
-@if gcc-bootstrap
-configure-libiberty: stage_current
-@endif gcc-bootstrap
-@if libiberty
-maybe-configure-libiberty: configure-libiberty
-configure-libiberty: 
-       @r=`${PWD_COMMAND}`; export r; \
+clean-libdecnumber: 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-       $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libiberty; \
-       cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} @extra_host_libiberty_configure_flags@ \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing clean in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(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 libiberty
 
+@endif libdecnumber
 
+.PHONY: maybe-distclean-libdecnumber distclean-libdecnumber
+maybe-distclean-libdecnumber:
+@if libdecnumber
+maybe-distclean-libdecnumber: distclean-libdecnumber
 
-.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
-maybe-configure-stage1-libiberty:
-@if libiberty-bootstrap
+distclean-libdecnumber: 
+       @[ -f ./libdecnumber/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 libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(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 libdecnumber
+
+.PHONY: maybe-maintainer-clean-libdecnumber maintainer-clean-libdecnumber
+maybe-maintainer-clean-libdecnumber:
+@if libdecnumber
+maybe-maintainer-clean-libdecnumber: maintainer-clean-libdecnumber
+
+maintainer-clean-libdecnumber: 
+       @[ -f ./libdecnumber/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 libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(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 libdecnumber
+
+
+
+.PHONY: configure-libgui maybe-configure-libgui
+maybe-configure-libgui:
+@if gcc-bootstrap
+configure-libgui: stage_current
+@endif gcc-bootstrap
+@if libgui
+maybe-configure-libgui: configure-libgui
+configure-libgui: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libgui; \
+       cd "$(HOST_SUBDIR)/libgui" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libgui; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias}  \
+         || exit 1
+@endif libgui
+
+
+
+
+
+.PHONY: all-libgui maybe-all-libgui
+maybe-all-libgui:
+@if gcc-bootstrap
+all-libgui: stage_current
+@endif gcc-bootstrap
+@if libgui
+TARGET-libgui=all
+maybe-all-libgui: all-libgui
+all-libgui: configure-libgui
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libgui))
+@endif libgui
+
+
+
+
+.PHONY: check-libgui maybe-check-libgui
+maybe-check-libgui:
+@if libgui
+maybe-check-libgui: check-libgui
+
+check-libgui:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif libgui
+
+.PHONY: install-libgui maybe-install-libgui
+maybe-install-libgui:
+@if libgui
+maybe-install-libgui: install-libgui
+
+install-libgui: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif libgui
+
+.PHONY: install-strip-libgui maybe-install-strip-libgui
+maybe-install-strip-libgui:
+@if libgui
+maybe-install-strip-libgui: install-strip-libgui
+
+install-strip-libgui: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif libgui
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libgui info-libgui
+maybe-info-libgui:
+@if libgui
+maybe-info-libgui: info-libgui
+
+info-libgui: \
+    configure-libgui 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+.PHONY: maybe-dvi-libgui dvi-libgui
+maybe-dvi-libgui:
+@if libgui
+maybe-dvi-libgui: dvi-libgui
+
+dvi-libgui: \
+    configure-libgui 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+.PHONY: maybe-pdf-libgui pdf-libgui
+maybe-pdf-libgui:
+@if libgui
+maybe-pdf-libgui: pdf-libgui
+
+pdf-libgui: \
+    configure-libgui 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+.PHONY: maybe-html-libgui html-libgui
+maybe-html-libgui:
+@if libgui
+maybe-html-libgui: html-libgui
+
+html-libgui: \
+    configure-libgui 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+.PHONY: maybe-TAGS-libgui TAGS-libgui
+maybe-TAGS-libgui:
+@if libgui
+maybe-TAGS-libgui: TAGS-libgui
+
+TAGS-libgui: \
+    configure-libgui 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+.PHONY: maybe-install-info-libgui install-info-libgui
+maybe-install-info-libgui:
+@if libgui
+maybe-install-info-libgui: install-info-libgui
+
+install-info-libgui: \
+    configure-libgui \
+    info-libgui 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+.PHONY: maybe-install-pdf-libgui install-pdf-libgui
+maybe-install-pdf-libgui:
+@if libgui
+maybe-install-pdf-libgui: install-pdf-libgui
+
+install-pdf-libgui: \
+    configure-libgui \
+    pdf-libgui 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+.PHONY: maybe-install-html-libgui install-html-libgui
+maybe-install-html-libgui:
+@if libgui
+maybe-install-html-libgui: install-html-libgui
+
+install-html-libgui: \
+    configure-libgui \
+    html-libgui 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+.PHONY: maybe-installcheck-libgui installcheck-libgui
+maybe-installcheck-libgui:
+@if libgui
+maybe-installcheck-libgui: installcheck-libgui
+
+installcheck-libgui: \
+    configure-libgui 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
+maybe-mostlyclean-libgui:
+@if libgui
+maybe-mostlyclean-libgui: mostlyclean-libgui
+
+mostlyclean-libgui: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+.PHONY: maybe-clean-libgui clean-libgui
+maybe-clean-libgui:
+@if libgui
+maybe-clean-libgui: clean-libgui
+
+clean-libgui: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+.PHONY: maybe-distclean-libgui distclean-libgui
+maybe-distclean-libgui:
+@if libgui
+maybe-distclean-libgui: distclean-libgui
+
+distclean-libgui: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
+maybe-maintainer-clean-libgui:
+@if libgui
+maybe-maintainer-clean-libgui: maintainer-clean-libgui
+
+maintainer-clean-libgui: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libgui/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 libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(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 libgui
+
+
+
+.PHONY: configure-libiberty maybe-configure-libiberty
+maybe-configure-libiberty:
+@if gcc-bootstrap
+configure-libiberty: stage_current
+@endif gcc-bootstrap
+@if libiberty
+maybe-configure-libiberty: configure-libiberty
+configure-libiberty: 
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libiberty; \
+       cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} @extra_host_libiberty_configure_flags@ \
+         || exit 1
+@endif libiberty
+
+
+
+.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
+maybe-configure-stage1-libiberty:
+@if libiberty-bootstrap
 maybe-configure-stage1-libiberty: configure-stage1-libiberty
 configure-stage1-libiberty:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
@@ -21845,11 +23145,12 @@ configure-stage1-libiberty:
          *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS) \
          @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
@@ -21878,12 +23179,12 @@ configure-stage2-libiberty:
          *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS) \
          @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
@@ -21912,12 +23213,12 @@ configure-stage3-libiberty:
          *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS) \
          @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
@@ -21946,12 +23247,12 @@ configure-stage4-libiberty:
          *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS) \
          @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
@@ -21980,12 +23281,12 @@ configure-stageprofile-libiberty:
          *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS) \
          @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
@@ -22014,12 +23315,12 @@ configure-stagefeedback-libiberty:
          *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
          @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
@@ -22041,7 +23342,7 @@ all-libiberty: configure-libiberty
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/libiberty && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-libiberty))
 @endif libiberty
 
@@ -22069,7 +23370,8 @@ all-stage1-libiberty: configure-stage1-libiberty
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-libiberty)
 
@@ -22084,7 +23386,7 @@ clean-stage1-libiberty:
        fi; \
        cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif libiberty-bootstrap
 
 
@@ -22125,9 +23427,7 @@ clean-stage2-libiberty:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif libiberty-bootstrap
 
 
@@ -22168,9 +23468,7 @@ clean-stage3-libiberty:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif libiberty-bootstrap
 
 
@@ -22211,9 +23509,7 @@ clean-stage4-libiberty:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif libiberty-bootstrap
 
 
@@ -22254,9 +23550,7 @@ clean-stageprofile-libiberty:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif libiberty-bootstrap
 
 
@@ -22297,9 +23591,7 @@ clean-stagefeedback-libiberty:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif libiberty-bootstrap
 
 
@@ -22679,6 +23971,886 @@ maintainer-clean-libiberty:
 
 
 
+.PHONY: configure-libiberty-linker-plugin maybe-configure-libiberty-linker-plugin
+maybe-configure-libiberty-linker-plugin:
+@if gcc-bootstrap
+configure-libiberty-linker-plugin: stage_current
+@endif gcc-bootstrap
+@if libiberty-linker-plugin
+maybe-configure-libiberty-linker-plugin: configure-libiberty-linker-plugin
+configure-libiberty-linker-plugin: 
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin ; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd "$(HOST_SUBDIR)/libiberty-linker-plugin" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \
+         || exit 1
+@endif libiberty-linker-plugin
+
+
+
+.PHONY: configure-stage1-libiberty-linker-plugin maybe-configure-stage1-libiberty-linker-plugin
+maybe-configure-stage1-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stage1-libiberty-linker-plugin: configure-stage1-libiberty-linker-plugin
+configure-stage1-libiberty-linker-plugin:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-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)/libiberty-linker-plugin ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin ; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stage2-libiberty-linker-plugin maybe-configure-stage2-libiberty-linker-plugin
+maybe-configure-stage2-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stage2-libiberty-linker-plugin: configure-stage2-libiberty-linker-plugin
+configure-stage2-libiberty-linker-plugin:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-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)/libiberty-linker-plugin ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin ; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(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)  \
+         $(STAGE2_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stage3-libiberty-linker-plugin maybe-configure-stage3-libiberty-linker-plugin
+maybe-configure-stage3-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stage3-libiberty-linker-plugin: configure-stage3-libiberty-linker-plugin
+configure-stage3-libiberty-linker-plugin:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/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)/libiberty-linker-plugin ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin ; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(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) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stage4-libiberty-linker-plugin maybe-configure-stage4-libiberty-linker-plugin
+maybe-configure-stage4-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stage4-libiberty-linker-plugin: configure-stage4-libiberty-linker-plugin
+configure-stage4-libiberty-linker-plugin:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/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)/libiberty-linker-plugin ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin ; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(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)  \
+         $(STAGE4_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stageprofile-libiberty-linker-plugin maybe-configure-stageprofile-libiberty-linker-plugin
+maybe-configure-stageprofile-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stageprofile-libiberty-linker-plugin: configure-stageprofile-libiberty-linker-plugin
+configure-stageprofile-libiberty-linker-plugin:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/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)/libiberty-linker-plugin ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin ; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(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)  \
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stagefeedback-libiberty-linker-plugin maybe-configure-stagefeedback-libiberty-linker-plugin
+maybe-configure-stagefeedback-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stagefeedback-libiberty-linker-plugin: configure-stagefeedback-libiberty-linker-plugin
+configure-stagefeedback-libiberty-linker-plugin:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/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)/libiberty-linker-plugin ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin ; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(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)  \
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+
+
+
+
+.PHONY: all-libiberty-linker-plugin maybe-all-libiberty-linker-plugin
+maybe-all-libiberty-linker-plugin:
+@if gcc-bootstrap
+all-libiberty-linker-plugin: stage_current
+@endif gcc-bootstrap
+@if libiberty-linker-plugin
+TARGET-libiberty-linker-plugin=all
+maybe-all-libiberty-linker-plugin: all-libiberty-linker-plugin
+all-libiberty-linker-plugin: configure-libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               $(TARGET-libiberty-linker-plugin))
+@endif libiberty-linker-plugin
+
+
+
+.PHONY: all-stage1-libiberty-linker-plugin maybe-all-stage1-libiberty-linker-plugin
+.PHONY: clean-stage1-libiberty-linker-plugin maybe-clean-stage1-libiberty-linker-plugin
+maybe-all-stage1-libiberty-linker-plugin:
+maybe-clean-stage1-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-all-stage1-libiberty-linker-plugin: all-stage1-libiberty-linker-plugin
+all-stage1: all-stage1-libiberty-linker-plugin
+TARGET-stage1-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
+all-stage1-libiberty-linker-plugin: configure-stage1-libiberty-linker-plugin
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_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_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-libiberty-linker-plugin)
+
+maybe-clean-stage1-libiberty-linker-plugin: clean-stage1-libiberty-linker-plugin
+clean-stage1: clean-stage1-libiberty-linker-plugin
+clean-stage1-libiberty-linker-plugin:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-libiberty-linker-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif libiberty-linker-plugin-bootstrap
+
+
+.PHONY: all-stage2-libiberty-linker-plugin maybe-all-stage2-libiberty-linker-plugin
+.PHONY: clean-stage2-libiberty-linker-plugin maybe-clean-stage2-libiberty-linker-plugin
+maybe-all-stage2-libiberty-linker-plugin:
+maybe-clean-stage2-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-all-stage2-libiberty-linker-plugin: all-stage2-libiberty-linker-plugin
+all-stage2: all-stage2-libiberty-linker-plugin
+TARGET-stage2-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
+all-stage2-libiberty-linker-plugin: configure-stage2-libiberty-linker-plugin
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE2_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE2_TFLAGS)" \
+               $(TARGET-stage2-libiberty-linker-plugin)
+
+maybe-clean-stage2-libiberty-linker-plugin: clean-stage2-libiberty-linker-plugin
+clean-stage2: clean-stage2-libiberty-linker-plugin
+clean-stage2-libiberty-linker-plugin:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-libiberty-linker-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif libiberty-linker-plugin-bootstrap
+
+
+.PHONY: all-stage3-libiberty-linker-plugin maybe-all-stage3-libiberty-linker-plugin
+.PHONY: clean-stage3-libiberty-linker-plugin maybe-clean-stage3-libiberty-linker-plugin
+maybe-all-stage3-libiberty-linker-plugin:
+maybe-clean-stage3-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-all-stage3-libiberty-linker-plugin: all-stage3-libiberty-linker-plugin
+all-stage3: all-stage3-libiberty-linker-plugin
+TARGET-stage3-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
+all-stage3-libiberty-linker-plugin: configure-stage3-libiberty-linker-plugin
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE3_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE3_TFLAGS)" \
+               $(TARGET-stage3-libiberty-linker-plugin)
+
+maybe-clean-stage3-libiberty-linker-plugin: clean-stage3-libiberty-linker-plugin
+clean-stage3: clean-stage3-libiberty-linker-plugin
+clean-stage3-libiberty-linker-plugin:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-libiberty-linker-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif libiberty-linker-plugin-bootstrap
+
+
+.PHONY: all-stage4-libiberty-linker-plugin maybe-all-stage4-libiberty-linker-plugin
+.PHONY: clean-stage4-libiberty-linker-plugin maybe-clean-stage4-libiberty-linker-plugin
+maybe-all-stage4-libiberty-linker-plugin:
+maybe-clean-stage4-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-all-stage4-libiberty-linker-plugin: all-stage4-libiberty-linker-plugin
+all-stage4: all-stage4-libiberty-linker-plugin
+TARGET-stage4-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
+all-stage4-libiberty-linker-plugin: configure-stage4-libiberty-linker-plugin
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE4_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE4_TFLAGS)" \
+               $(TARGET-stage4-libiberty-linker-plugin)
+
+maybe-clean-stage4-libiberty-linker-plugin: clean-stage4-libiberty-linker-plugin
+clean-stage4: clean-stage4-libiberty-linker-plugin
+clean-stage4-libiberty-linker-plugin:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-libiberty-linker-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif libiberty-linker-plugin-bootstrap
+
+
+.PHONY: all-stageprofile-libiberty-linker-plugin maybe-all-stageprofile-libiberty-linker-plugin
+.PHONY: clean-stageprofile-libiberty-linker-plugin maybe-clean-stageprofile-libiberty-linker-plugin
+maybe-all-stageprofile-libiberty-linker-plugin:
+maybe-clean-stageprofile-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-all-stageprofile-libiberty-linker-plugin: all-stageprofile-libiberty-linker-plugin
+all-stageprofile: all-stageprofile-libiberty-linker-plugin
+TARGET-stageprofile-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
+all-stageprofile-libiberty-linker-plugin: configure-stageprofile-libiberty-linker-plugin
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEprofile_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               $(TARGET-stageprofile-libiberty-linker-plugin)
+
+maybe-clean-stageprofile-libiberty-linker-plugin: clean-stageprofile-libiberty-linker-plugin
+clean-stageprofile: clean-stageprofile-libiberty-linker-plugin
+clean-stageprofile-libiberty-linker-plugin:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-libiberty-linker-plugin/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif libiberty-linker-plugin-bootstrap
+
+
+.PHONY: all-stagefeedback-libiberty-linker-plugin maybe-all-stagefeedback-libiberty-linker-plugin
+.PHONY: clean-stagefeedback-libiberty-linker-plugin maybe-clean-stagefeedback-libiberty-linker-plugin
+maybe-all-stagefeedback-libiberty-linker-plugin:
+maybe-clean-stagefeedback-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-all-stagefeedback-libiberty-linker-plugin: all-stagefeedback-libiberty-linker-plugin
+all-stagefeedback: all-stagefeedback-libiberty-linker-plugin
+TARGET-stagefeedback-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
+all-stagefeedback-libiberty-linker-plugin: configure-stagefeedback-libiberty-linker-plugin
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEfeedback_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               $(TARGET-stagefeedback-libiberty-linker-plugin)
+
+maybe-clean-stagefeedback-libiberty-linker-plugin: clean-stagefeedback-libiberty-linker-plugin
+clean-stagefeedback: clean-stagefeedback-libiberty-linker-plugin
+clean-stagefeedback-libiberty-linker-plugin:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libiberty-linker-plugin/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif libiberty-linker-plugin-bootstrap
+
+
+
+
+
+.PHONY: check-libiberty-linker-plugin maybe-check-libiberty-linker-plugin
+maybe-check-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-check-libiberty-linker-plugin: check-libiberty-linker-plugin
+
+check-libiberty-linker-plugin:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ check)
+
+@endif libiberty-linker-plugin
+
+.PHONY: install-libiberty-linker-plugin maybe-install-libiberty-linker-plugin
+maybe-install-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-libiberty-linker-plugin: install-libiberty-linker-plugin
+
+install-libiberty-linker-plugin: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install)
+
+@endif libiberty-linker-plugin
+
+.PHONY: install-strip-libiberty-linker-plugin maybe-install-strip-libiberty-linker-plugin
+maybe-install-strip-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-strip-libiberty-linker-plugin: install-strip-libiberty-linker-plugin
+
+install-strip-libiberty-linker-plugin: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install-strip)
+
+@endif libiberty-linker-plugin
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libiberty-linker-plugin info-libiberty-linker-plugin
+maybe-info-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-info-libiberty-linker-plugin: info-libiberty-linker-plugin
+
+info-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing info in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+.PHONY: maybe-dvi-libiberty-linker-plugin dvi-libiberty-linker-plugin
+maybe-dvi-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-dvi-libiberty-linker-plugin: dvi-libiberty-linker-plugin
+
+dvi-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing dvi in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+.PHONY: maybe-pdf-libiberty-linker-plugin pdf-libiberty-linker-plugin
+maybe-pdf-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-pdf-libiberty-linker-plugin: pdf-libiberty-linker-plugin
+
+pdf-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing pdf in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+.PHONY: maybe-html-libiberty-linker-plugin html-libiberty-linker-plugin
+maybe-html-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-html-libiberty-linker-plugin: html-libiberty-linker-plugin
+
+html-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+.PHONY: maybe-TAGS-libiberty-linker-plugin TAGS-libiberty-linker-plugin
+maybe-TAGS-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-TAGS-libiberty-linker-plugin: TAGS-libiberty-linker-plugin
+
+TAGS-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+.PHONY: maybe-install-info-libiberty-linker-plugin install-info-libiberty-linker-plugin
+maybe-install-info-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-info-libiberty-linker-plugin: install-info-libiberty-linker-plugin
+
+install-info-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin \
+    info-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-info in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+.PHONY: maybe-install-pdf-libiberty-linker-plugin install-pdf-libiberty-linker-plugin
+maybe-install-pdf-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-pdf-libiberty-linker-plugin: install-pdf-libiberty-linker-plugin
+
+install-pdf-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin \
+    pdf-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-pdf in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+.PHONY: maybe-install-html-libiberty-linker-plugin install-html-libiberty-linker-plugin
+maybe-install-html-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-html-libiberty-linker-plugin: install-html-libiberty-linker-plugin
+
+install-html-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin \
+    html-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-html in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+.PHONY: maybe-installcheck-libiberty-linker-plugin installcheck-libiberty-linker-plugin
+maybe-installcheck-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-installcheck-libiberty-linker-plugin: installcheck-libiberty-linker-plugin
+
+installcheck-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing installcheck in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+.PHONY: maybe-mostlyclean-libiberty-linker-plugin mostlyclean-libiberty-linker-plugin
+maybe-mostlyclean-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-mostlyclean-libiberty-linker-plugin: mostlyclean-libiberty-linker-plugin
+
+mostlyclean-libiberty-linker-plugin: 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing mostlyclean in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+.PHONY: maybe-clean-libiberty-linker-plugin clean-libiberty-linker-plugin
+maybe-clean-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-clean-libiberty-linker-plugin: clean-libiberty-linker-plugin
+
+clean-libiberty-linker-plugin: 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing clean in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+.PHONY: maybe-distclean-libiberty-linker-plugin distclean-libiberty-linker-plugin
+maybe-distclean-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-distclean-libiberty-linker-plugin: distclean-libiberty-linker-plugin
+
+distclean-libiberty-linker-plugin: 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing distclean in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+.PHONY: maybe-maintainer-clean-libiberty-linker-plugin maintainer-clean-libiberty-linker-plugin
+maybe-maintainer-clean-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-maintainer-clean-libiberty-linker-plugin: maintainer-clean-libiberty-linker-plugin
+
+maintainer-clean-libiberty-linker-plugin: 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing maintainer-clean in libiberty-linker-plugin" ; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(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 libiberty-linker-plugin
+
+
+
 .PHONY: configure-libiconv maybe-configure-libiconv
 maybe-configure-libiconv:
 @if gcc-bootstrap
@@ -22700,11 +24872,12 @@ configure-libiconv:
          *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiconv"; \
-       libsrcdir="$$s/libiconv"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiconv; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared \
+         --target=${target_alias} --disable-shared \
          || exit 1
 @endif libiconv
 
@@ -22726,7 +24899,7 @@ all-libiconv: configure-libiconv
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/libiconv && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-libiconv))
 @endif libiconv
 
@@ -23077,11 +25250,12 @@ configure-m4:
          *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/m4"; \
-       libsrcdir="$$s/m4"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=m4; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif m4
 
@@ -23103,7 +25277,7 @@ all-m4: configure-m4
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/m4 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-m4))
 @endif m4
 
@@ -23517,11 +25691,12 @@ configure-readline:
          *) topdir=`echo $(HOST_SUBDIR)/readline/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/readline"; \
-       libsrcdir="$$s/readline"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=readline; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif readline
 
@@ -23543,7 +25718,7 @@ all-readline: configure-readline
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-readline))
 @endif readline
 
@@ -23957,11 +26132,12 @@ configure-sid:
          *) topdir=`echo $(HOST_SUBDIR)/sid/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/sid"; \
-       libsrcdir="$$s/sid"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=sid; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif sid
 
@@ -23983,7 +26159,7 @@ all-sid: configure-sid
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-sid))
 @endif sid
 
@@ -24397,11 +26573,12 @@ configure-sim:
          *) topdir=`echo $(HOST_SUBDIR)/sim/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/sim"; \
-       libsrcdir="$$s/sim"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=sim; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif sim
 
@@ -24423,7 +26600,7 @@ all-sim: configure-sim
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-sim))
 @endif sim
 
@@ -24837,11 +27014,12 @@ configure-texinfo:
          *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/texinfo"; \
-       libsrcdir="$$s/texinfo"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=texinfo; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif texinfo
 
@@ -24863,7 +27041,7 @@ all-texinfo: configure-texinfo
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-texinfo))
 @endif texinfo
 
@@ -25264,11 +27442,12 @@ configure-zlib:
          *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif zlib
 
@@ -25297,11 +27476,12 @@ configure-stage1-zlib:
          *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
@@ -25329,12 +27509,12 @@ configure-stage2-zlib:
          *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
@@ -25362,12 +27542,12 @@ configure-stage3-zlib:
          *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
@@ -25395,12 +27575,12 @@ configure-stage4-zlib:
          *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
@@ -25428,12 +27608,12 @@ configure-stageprofile-zlib:
          *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
@@ -25461,12 +27641,12 @@ configure-stagefeedback-zlib:
          *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
@@ -25487,7 +27667,7 @@ all-zlib: configure-zlib
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-zlib))
 @endif zlib
 
@@ -25515,7 +27695,8 @@ all-stage1-zlib: configure-stage1-zlib
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-zlib)
 
@@ -25530,7 +27711,7 @@ clean-stage1-zlib:
        fi; \
        cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif zlib-bootstrap
 
 
@@ -25571,9 +27752,7 @@ clean-stage2-zlib:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif zlib-bootstrap
 
 
@@ -25614,9 +27793,7 @@ clean-stage3-zlib:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif zlib-bootstrap
 
 
@@ -25657,9 +27834,7 @@ clean-stage4-zlib:
          $(MAKE) stage4-start; \
        fi; \
        cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif zlib-bootstrap
 
 
@@ -25700,9 +27875,7 @@ clean-stageprofile-zlib:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif zlib-bootstrap
 
 
@@ -25743,9 +27916,7 @@ clean-stagefeedback-zlib:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
 @endif zlib-bootstrap
 
 
@@ -26128,11 +28299,12 @@ configure-gdb:
          *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gdb"; \
-       libsrcdir="$$s/gdb"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gdb; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif gdb
 
@@ -26154,7 +28326,7 @@ all-gdb: configure-gdb
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-gdb))
 @endif gdb
 
@@ -26568,11 +28740,12 @@ configure-expect:
          *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/expect"; \
-       libsrcdir="$$s/expect"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=expect; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif expect
 
@@ -26594,7 +28767,7 @@ all-expect: configure-expect
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-expect))
 @endif expect
 
@@ -27008,11 +29181,12 @@ configure-guile:
          *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/guile"; \
-       libsrcdir="$$s/guile"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=guile; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif guile
 
@@ -27034,7 +29208,7 @@ all-guile: configure-guile
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-guile))
 @endif guile
 
@@ -27448,11 +29622,12 @@ configure-tk:
          *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/tk"; \
-       libsrcdir="$$s/tk"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=tk; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif tk
 
@@ -27474,7 +29649,7 @@ all-tk: configure-tk
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/tk && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-tk))
 @endif tk
 
@@ -27888,11 +30063,12 @@ configure-libtermcap:
          *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libtermcap"; \
-       libsrcdir="$$s/libtermcap"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libtermcap; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif libtermcap
 
@@ -27914,7 +30090,7 @@ all-libtermcap: configure-libtermcap
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-libtermcap))
 @endif libtermcap
 
@@ -28262,11 +30438,12 @@ configure-utils:
          *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/utils"; \
-       libsrcdir="$$s/utils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=utils; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif utils
 
@@ -28288,7 +30465,7 @@ all-utils: configure-utils
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/utils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                $(TARGET-utils))
 @endif utils
 
@@ -28696,1669 +30873,3617 @@ configure-gnattools:
          *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gnattools"; \
-       libsrcdir="$$s/gnattools"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gnattools; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --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/ | \
+               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} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         $(STAGE2_CONFIGURE_FLAGS) \
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stage3-lto-plugin maybe-configure-stage3-lto-plugin
+maybe-configure-stage3-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stage3-lto-plugin: configure-stage3-lto-plugin
+configure-stage3-lto-plugin:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/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)/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} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stage4-lto-plugin maybe-configure-stage4-lto-plugin
+maybe-configure-stage4-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stage4-lto-plugin: configure-stage4-lto-plugin
+configure-stage4-lto-plugin:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/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)/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} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         $(STAGE4_CONFIGURE_FLAGS) \
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stageprofile-lto-plugin maybe-configure-stageprofile-lto-plugin
+maybe-configure-stageprofile-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
+configure-stageprofile-lto-plugin:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/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)/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} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stagefeedback-lto-plugin maybe-configure-stagefeedback-lto-plugin
+maybe-configure-stagefeedback-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
+configure-stagefeedback-lto-plugin:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/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)/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} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif lto-plugin-bootstrap
+
+
+
+
+
+.PHONY: all-lto-plugin maybe-all-lto-plugin
+maybe-all-lto-plugin:
+@if gcc-bootstrap
+all-lto-plugin: stage_current
+@endif gcc-bootstrap
+@if lto-plugin
+TARGET-lto-plugin=all
+maybe-all-lto-plugin: all-lto-plugin
+all-lto-plugin: configure-lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               $(TARGET-lto-plugin))
+@endif lto-plugin
+
+
+
+.PHONY: all-stage1-lto-plugin maybe-all-stage1-lto-plugin
+.PHONY: clean-stage1-lto-plugin maybe-clean-stage1-lto-plugin
+maybe-all-stage1-lto-plugin:
+maybe-clean-stage1-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stage1-lto-plugin: all-stage1-lto-plugin
+all-stage1: all-stage1-lto-plugin
+TARGET-stage1-lto-plugin = $(TARGET-lto-plugin)
+all-stage1-lto-plugin: configure-stage1-lto-plugin
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_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_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-lto-plugin)
+
+maybe-clean-stage1-lto-plugin: clean-stage1-lto-plugin
+clean-stage1: clean-stage1-lto-plugin
+clean-stage1-lto-plugin:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-lto-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stage2-lto-plugin maybe-all-stage2-lto-plugin
+.PHONY: clean-stage2-lto-plugin maybe-clean-stage2-lto-plugin
+maybe-all-stage2-lto-plugin:
+maybe-clean-stage2-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stage2-lto-plugin: all-stage2-lto-plugin
+all-stage2: all-stage2-lto-plugin
+TARGET-stage2-lto-plugin = $(TARGET-lto-plugin)
+all-stage2-lto-plugin: configure-stage2-lto-plugin
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE2_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE2_TFLAGS)" \
+               $(TARGET-stage2-lto-plugin)
+
+maybe-clean-stage2-lto-plugin: clean-stage2-lto-plugin
+clean-stage2: clean-stage2-lto-plugin
+clean-stage2-lto-plugin:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-lto-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stage3-lto-plugin maybe-all-stage3-lto-plugin
+.PHONY: clean-stage3-lto-plugin maybe-clean-stage3-lto-plugin
+maybe-all-stage3-lto-plugin:
+maybe-clean-stage3-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stage3-lto-plugin: all-stage3-lto-plugin
+all-stage3: all-stage3-lto-plugin
+TARGET-stage3-lto-plugin = $(TARGET-lto-plugin)
+all-stage3-lto-plugin: configure-stage3-lto-plugin
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE3_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE3_TFLAGS)" \
+               $(TARGET-stage3-lto-plugin)
+
+maybe-clean-stage3-lto-plugin: clean-stage3-lto-plugin
+clean-stage3: clean-stage3-lto-plugin
+clean-stage3-lto-plugin:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-lto-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stage4-lto-plugin maybe-all-stage4-lto-plugin
+.PHONY: clean-stage4-lto-plugin maybe-clean-stage4-lto-plugin
+maybe-all-stage4-lto-plugin:
+maybe-clean-stage4-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stage4-lto-plugin: all-stage4-lto-plugin
+all-stage4: all-stage4-lto-plugin
+TARGET-stage4-lto-plugin = $(TARGET-lto-plugin)
+all-stage4-lto-plugin: configure-stage4-lto-plugin
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE4_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE4_TFLAGS)" \
+               $(TARGET-stage4-lto-plugin)
+
+maybe-clean-stage4-lto-plugin: clean-stage4-lto-plugin
+clean-stage4: clean-stage4-lto-plugin
+clean-stage4-lto-plugin:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-lto-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stageprofile-lto-plugin maybe-all-stageprofile-lto-plugin
+.PHONY: clean-stageprofile-lto-plugin maybe-clean-stageprofile-lto-plugin
+maybe-all-stageprofile-lto-plugin:
+maybe-clean-stageprofile-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stageprofile-lto-plugin: all-stageprofile-lto-plugin
+all-stageprofile: all-stageprofile-lto-plugin
+TARGET-stageprofile-lto-plugin = $(TARGET-lto-plugin)
+all-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEprofile_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               $(TARGET-stageprofile-lto-plugin)
+
+maybe-clean-stageprofile-lto-plugin: clean-stageprofile-lto-plugin
+clean-stageprofile: clean-stageprofile-lto-plugin
+clean-stageprofile-lto-plugin:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-lto-plugin/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stagefeedback-lto-plugin maybe-all-stagefeedback-lto-plugin
+.PHONY: clean-stagefeedback-lto-plugin maybe-clean-stagefeedback-lto-plugin
+maybe-all-stagefeedback-lto-plugin:
+maybe-clean-stagefeedback-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stagefeedback-lto-plugin: all-stagefeedback-lto-plugin
+all-stagefeedback: all-stagefeedback-lto-plugin
+TARGET-stagefeedback-lto-plugin = $(TARGET-lto-plugin)
+all-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEfeedback_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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               $(TARGET-stagefeedback-lto-plugin)
+
+maybe-clean-stagefeedback-lto-plugin: clean-stagefeedback-lto-plugin
+clean-stagefeedback: clean-stagefeedback-lto-plugin
+clean-stagefeedback-lto-plugin:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-lto-plugin/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif lto-plugin-bootstrap
+
+
+
+
+
+.PHONY: check-lto-plugin maybe-check-lto-plugin
+maybe-check-lto-plugin:
+@if lto-plugin
+maybe-check-lto-plugin: check-lto-plugin
+
+check-lto-plugin:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ check)
+
+@endif lto-plugin
+
+.PHONY: install-lto-plugin maybe-install-lto-plugin
+maybe-install-lto-plugin:
+@if lto-plugin
+maybe-install-lto-plugin: install-lto-plugin
+
+install-lto-plugin: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install)
+
+@endif lto-plugin
+
+.PHONY: install-strip-lto-plugin maybe-install-strip-lto-plugin
+maybe-install-strip-lto-plugin:
+@if lto-plugin
+maybe-install-strip-lto-plugin: install-strip-lto-plugin
+
+install-strip-lto-plugin: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install-strip)
+
+@endif lto-plugin
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-lto-plugin info-lto-plugin
+maybe-info-lto-plugin:
+@if lto-plugin
+maybe-info-lto-plugin: info-lto-plugin
+
+info-lto-plugin: \
+    configure-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing info in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+.PHONY: maybe-dvi-lto-plugin dvi-lto-plugin
+maybe-dvi-lto-plugin:
+@if lto-plugin
+maybe-dvi-lto-plugin: dvi-lto-plugin
+
+dvi-lto-plugin: \
+    configure-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing dvi in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+.PHONY: maybe-pdf-lto-plugin pdf-lto-plugin
+maybe-pdf-lto-plugin:
+@if lto-plugin
+maybe-pdf-lto-plugin: pdf-lto-plugin
+
+pdf-lto-plugin: \
+    configure-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing pdf in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+.PHONY: maybe-html-lto-plugin html-lto-plugin
+maybe-html-lto-plugin:
+@if lto-plugin
+maybe-html-lto-plugin: html-lto-plugin
+
+html-lto-plugin: \
+    configure-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+.PHONY: maybe-TAGS-lto-plugin TAGS-lto-plugin
+maybe-TAGS-lto-plugin:
+@if lto-plugin
+maybe-TAGS-lto-plugin: TAGS-lto-plugin
+
+TAGS-lto-plugin: \
+    configure-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+.PHONY: maybe-install-info-lto-plugin install-info-lto-plugin
+maybe-install-info-lto-plugin:
+@if lto-plugin
+maybe-install-info-lto-plugin: install-info-lto-plugin
+
+install-info-lto-plugin: \
+    configure-lto-plugin \
+    info-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-info in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+.PHONY: maybe-install-pdf-lto-plugin install-pdf-lto-plugin
+maybe-install-pdf-lto-plugin:
+@if lto-plugin
+maybe-install-pdf-lto-plugin: install-pdf-lto-plugin
+
+install-pdf-lto-plugin: \
+    configure-lto-plugin \
+    pdf-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-pdf in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+.PHONY: maybe-install-html-lto-plugin install-html-lto-plugin
+maybe-install-html-lto-plugin:
+@if lto-plugin
+maybe-install-html-lto-plugin: install-html-lto-plugin
+
+install-html-lto-plugin: \
+    configure-lto-plugin \
+    html-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-html in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+.PHONY: maybe-installcheck-lto-plugin installcheck-lto-plugin
+maybe-installcheck-lto-plugin:
+@if lto-plugin
+maybe-installcheck-lto-plugin: installcheck-lto-plugin
+
+installcheck-lto-plugin: \
+    configure-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing installcheck in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+.PHONY: maybe-mostlyclean-lto-plugin mostlyclean-lto-plugin
+maybe-mostlyclean-lto-plugin:
+@if lto-plugin
+maybe-mostlyclean-lto-plugin: mostlyclean-lto-plugin
+
+mostlyclean-lto-plugin: 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing mostlyclean in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+.PHONY: maybe-clean-lto-plugin clean-lto-plugin
+maybe-clean-lto-plugin:
+@if lto-plugin
+maybe-clean-lto-plugin: clean-lto-plugin
+
+clean-lto-plugin: 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing clean in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+.PHONY: maybe-distclean-lto-plugin distclean-lto-plugin
+maybe-distclean-lto-plugin:
+@if lto-plugin
+maybe-distclean-lto-plugin: distclean-lto-plugin
+
+distclean-lto-plugin: 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing distclean in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+.PHONY: maybe-maintainer-clean-lto-plugin maintainer-clean-lto-plugin
+maybe-maintainer-clean-lto-plugin:
+@if lto-plugin
+maybe-maintainer-clean-lto-plugin: maintainer-clean-lto-plugin
+
+maintainer-clean-lto-plugin: 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing maintainer-clean in lto-plugin" ; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(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 lto-plugin
+
+
+
+# ---------------------------------------
+# Modules which run on the target machine
+# ---------------------------------------
+
+
+
+
+.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
+maybe-configure-target-libstdc++-v3:
+@if gcc-bootstrap
+configure-target-libstdc++-v3: stage_current
+@endif gcc-bootstrap
+@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 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; \
+       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; \
+       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-libstdc++-v3
+
+
+
+.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)/libstdc++-v3
+       @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; \
+       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} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-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:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(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 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; \
+       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)  \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-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:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(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 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; \
+       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)  \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-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:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(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 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; \
+       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)  \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-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:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(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 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; \
+       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)  \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
+
+
+
+
+
+.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
+maybe-all-target-libstdc++-v3:
+@if gcc-bootstrap
+all-target-libstdc++-v3: 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
+       @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
+
+
+
+.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)/libstdc++-v3 && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+                 \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-target-libstdc++-v3)
+
+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)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/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
+       @[ $(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 && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE2_TFLAGS)" \
+               $(TARGET-stage2-target-libstdc++-v3)
+
+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)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/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
+       @[ $(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 && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE3_TFLAGS)" \
+               $(TARGET-stage3-target-libstdc++-v3)
+
+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)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/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
+       @[ $(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 && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE4_TFLAGS)" \
+               $(TARGET-stage4-target-libstdc++-v3)
+
+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)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/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
+       @[ $(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 && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               $(TARGET-stageprofile-target-libstdc++-v3)
+
+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)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/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-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)/libstdc++-v3 && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               $(TARGET-stagefeedback-target-libstdc++-v3)
+
+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)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/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-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)  \
-               $(TARGET-gnattools))
-@endif gnattools
 
 
 
 
-.PHONY: check-gnattools maybe-check-gnattools
-maybe-check-gnattools:
-@if gnattools
-maybe-check-gnattools: check-gnattools
+.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-gnattools:
+check-target-libstdc++-v3:
        @: $(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)
+       $(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)
 
-@endif gnattools
+@endif target-libstdc++-v3
 
-.PHONY: install-gnattools maybe-install-gnattools
-maybe-install-gnattools:
-@if gnattools
-maybe-install-gnattools: install-gnattools
+.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-gnattools: installdirs
+install-target-libstdc++-v3: 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)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif gnattools
+@endif target-libstdc++-v3
 
-.PHONY: install-strip-gnattools maybe-install-strip-gnattools
-maybe-install-strip-gnattools:
-@if gnattools
-maybe-install-strip-gnattools: install-strip-gnattools
+.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-gnattools: installdirs
+install-strip-target-libstdc++-v3: 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)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif gnattools
+@endif target-libstdc++-v3
 
 # 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-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-gnattools: \
-    configure-gnattools 
+info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing info in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
-.PHONY: maybe-dvi-gnattools dvi-gnattools
-maybe-dvi-gnattools:
-@if gnattools
-maybe-dvi-gnattools: dvi-gnattools
+.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-gnattools: \
-    configure-gnattools 
+dvi-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing dvi in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
-.PHONY: maybe-pdf-gnattools pdf-gnattools
-maybe-pdf-gnattools:
-@if gnattools
-maybe-pdf-gnattools: pdf-gnattools
+.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-gnattools: \
-    configure-gnattools 
+pdf-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing pdf in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
-.PHONY: maybe-html-gnattools html-gnattools
-maybe-html-gnattools:
-@if gnattools
-maybe-html-gnattools: html-gnattools
+.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-gnattools: \
-    configure-gnattools 
+html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing html in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
-.PHONY: maybe-TAGS-gnattools TAGS-gnattools
-maybe-TAGS-gnattools:
-@if gnattools
-maybe-TAGS-gnattools: TAGS-gnattools
+.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-gnattools: \
-    configure-gnattools 
+TAGS-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing TAGS in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
-.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-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-gnattools: \
-    configure-gnattools \
-    info-gnattools 
+install-info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    info-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing install-info in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
-.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-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-gnattools: \
-    configure-gnattools \
-    pdf-gnattools 
+install-pdf-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    pdf-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing install-pdf in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
-.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-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-gnattools: \
-    configure-gnattools \
-    html-gnattools 
+install-html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    html-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing install-html in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
-.PHONY: maybe-installcheck-gnattools installcheck-gnattools
-maybe-installcheck-gnattools:
-@if gnattools
-maybe-installcheck-gnattools: installcheck-gnattools
+.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-gnattools: \
-    configure-gnattools 
+installcheck-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing installcheck in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
-.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools
-maybe-mostlyclean-gnattools:
-@if gnattools
-maybe-mostlyclean-gnattools: mostlyclean-gnattools
+.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-gnattools
+mostlyclean-target-libstdc++-v3
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing mostlyclean in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
-.PHONY: maybe-clean-gnattools clean-gnattools
-maybe-clean-gnattools:
-@if gnattools
-maybe-clean-gnattools: clean-gnattools
+.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-gnattools
+clean-target-libstdc++-v3
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing clean in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
-.PHONY: maybe-distclean-gnattools distclean-gnattools
-maybe-distclean-gnattools:
-@if gnattools
-maybe-distclean-gnattools: distclean-gnattools
+.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-gnattools
+distclean-target-libstdc++-v3
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing distclean in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
-.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-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-gnattools
+maintainer-clean-target-libstdc++-v3
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       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; \
-       echo "Doing maintainer-clean in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(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 gnattools
+@endif target-libstdc++-v3
 
 
 
-.PHONY: configure-lto-plugin maybe-configure-lto-plugin
-maybe-configure-lto-plugin:
+
+
+.PHONY: configure-target-libsanitizer maybe-configure-target-libsanitizer
+maybe-configure-target-libsanitizer:
 @if gcc-bootstrap
-configure-lto-plugin: stage_current
+configure-target-libsanitizer: stage_current
 @endif gcc-bootstrap
-@if lto-plugin
-maybe-configure-lto-plugin: configure-lto-plugin
-configure-lto-plugin
+@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; \
-       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; \
+       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)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       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 $(HOST_SUBDIR)/lto-plugin/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --enable-shared \
+       module_srcdir=libsanitizer; \
+       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 lto-plugin
+@endif target-libsanitizer
 
 
 
-.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:
+.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 $(HOST_SUBDIR)/lto-plugin
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @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; \
+       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)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       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)/libsanitizer ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS) \
-         --enable-shared
-@endif lto-plugin-bootstrap
+       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-libsanitizer-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:
+.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 $(HOST_SUBDIR)/lto-plugin
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @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; \
+       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)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       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)/libsanitizer ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE2_CONFIGURE_FLAGS) \
-         --enable-shared
-@endif lto-plugin-bootstrap
+       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-libsanitizer-bootstrap
 
-.PHONY: configure-stage3-lto-plugin maybe-configure-stage3-lto-plugin
-maybe-configure-stage3-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-configure-stage3-lto-plugin: configure-stage3-lto-plugin
-configure-stage3-lto-plugin:
+.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 $(HOST_SUBDIR)/lto-plugin
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/lto-plugin/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)/lto-plugin ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \
-       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+       @$(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 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)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       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)/libsanitizer ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE3_CONFIGURE_FLAGS) \
-         --enable-shared
-@endif lto-plugin-bootstrap
+       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-libsanitizer-bootstrap
 
-.PHONY: configure-stage4-lto-plugin maybe-configure-stage4-lto-plugin
-maybe-configure-stage4-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-configure-stage4-lto-plugin: configure-stage4-lto-plugin
-configure-stage4-lto-plugin:
+.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 $(HOST_SUBDIR)/lto-plugin
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/lto-plugin/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)/lto-plugin ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \
-       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+       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)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       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)/libsanitizer ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE4_CONFIGURE_FLAGS) \
-         --enable-shared
-@endif lto-plugin-bootstrap
+       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-libsanitizer-bootstrap
 
-.PHONY: configure-stageprofile-lto-plugin maybe-configure-stageprofile-lto-plugin
-maybe-configure-stageprofile-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-configure-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
-configure-stageprofile-lto-plugin:
+.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 $(HOST_SUBDIR)/lto-plugin
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/lto-plugin/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)/lto-plugin ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \
-       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+       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)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       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)/libsanitizer ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEprofile_CONFIGURE_FLAGS) \
-         --enable-shared
-@endif lto-plugin-bootstrap
+       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-libsanitizer-bootstrap
 
-.PHONY: configure-stagefeedback-lto-plugin maybe-configure-stagefeedback-lto-plugin
-maybe-configure-stagefeedback-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-configure-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
-configure-stagefeedback-lto-plugin:
+.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 $(HOST_SUBDIR)/lto-plugin
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/lto-plugin/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)/lto-plugin ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \
-       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+       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)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       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)/libsanitizer ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --enable-shared
-@endif lto-plugin-bootstrap
+       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-libsanitizer-bootstrap
 
 
 
 
 
-.PHONY: all-lto-plugin maybe-all-lto-plugin
-maybe-all-lto-plugin:
+.PHONY: all-target-libsanitizer maybe-all-target-libsanitizer
+maybe-all-target-libsanitizer:
 @if gcc-bootstrap
-all-lto-plugin: stage_current
+all-target-libsanitizer: stage_current
 @endif gcc-bootstrap
-@if lto-plugin
-TARGET-lto-plugin=all
-maybe-all-lto-plugin: all-lto-plugin
-all-lto-plugin: configure-lto-plugin
+@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; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-lto-plugin))
-@endif lto-plugin
-
-
-
-.PHONY: all-stage1-lto-plugin maybe-all-stage1-lto-plugin
-.PHONY: clean-stage1-lto-plugin maybe-clean-stage1-lto-plugin
-maybe-all-stage1-lto-plugin:
-maybe-clean-stage1-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-all-stage1-lto-plugin: all-stage1-lto-plugin
-all-stage1: all-stage1-lto-plugin
-TARGET-stage1-lto-plugin = $(TARGET-lto-plugin)
-all-stage1-lto-plugin: configure-stage1-lto-plugin
+       $(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-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)"; \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" \
-               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
-               LIBCFLAGS="$(LIBCFLAGS)" \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+                 \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-lto-plugin)
+               $(TARGET-stage1-target-libsanitizer)
 
-maybe-clean-stage1-lto-plugin: clean-stage1-lto-plugin
-clean-stage1: clean-stage1-lto-plugin
-clean-stage1-lto-plugin:
+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 $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-lto-plugin/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage1-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/lto-plugin && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif lto-plugin-bootstrap
-
-
-.PHONY: all-stage2-lto-plugin maybe-all-stage2-lto-plugin
-.PHONY: clean-stage2-lto-plugin maybe-clean-stage2-lto-plugin
-maybe-all-stage2-lto-plugin:
-maybe-clean-stage2-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-all-stage2-lto-plugin: all-stage2-lto-plugin
-all-stage2: all-stage2-lto-plugin
-TARGET-stage2-lto-plugin = $(TARGET-lto-plugin)
-all-stage2-lto-plugin: configure-stage2-lto-plugin
+       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-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)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" \
-               CXXFLAGS="$(STAGE2_CXXFLAGS)" \
-               LIBCFLAGS="$(STAGE2_CFLAGS)" \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-lto-plugin)
+               $(TARGET-stage2-target-libsanitizer)
 
-maybe-clean-stage2-lto-plugin: clean-stage2-lto-plugin
-clean-stage2: clean-stage2-lto-plugin
-clean-stage2-lto-plugin:
+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 $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-lto-plugin/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage2-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/lto-plugin && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif lto-plugin-bootstrap
-
-
-.PHONY: all-stage3-lto-plugin maybe-all-stage3-lto-plugin
-.PHONY: clean-stage3-lto-plugin maybe-clean-stage3-lto-plugin
-maybe-all-stage3-lto-plugin:
-maybe-clean-stage3-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-all-stage3-lto-plugin: all-stage3-lto-plugin
-all-stage3: all-stage3-lto-plugin
-TARGET-stage3-lto-plugin = $(TARGET-lto-plugin)
-all-stage3-lto-plugin: configure-stage3-lto-plugin
+       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)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" \
-               CXXFLAGS="$(STAGE3_CXXFLAGS)" \
-               LIBCFLAGS="$(STAGE3_CFLAGS)" \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-lto-plugin)
+               $(TARGET-stage3-target-libsanitizer)
 
-maybe-clean-stage3-lto-plugin: clean-stage3-lto-plugin
-clean-stage3: clean-stage3-lto-plugin
-clean-stage3-lto-plugin:
+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 $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-lto-plugin/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage3-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/lto-plugin && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif lto-plugin-bootstrap
-
-
-.PHONY: all-stage4-lto-plugin maybe-all-stage4-lto-plugin
-.PHONY: clean-stage4-lto-plugin maybe-clean-stage4-lto-plugin
-maybe-all-stage4-lto-plugin:
-maybe-clean-stage4-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-all-stage4-lto-plugin: all-stage4-lto-plugin
-all-stage4: all-stage4-lto-plugin
-TARGET-stage4-lto-plugin = $(TARGET-lto-plugin)
-all-stage4-lto-plugin: configure-stage4-lto-plugin
+       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)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" \
-               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
-               LIBCFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-lto-plugin)
+               $(TARGET-stage4-target-libsanitizer)
 
-maybe-clean-stage4-lto-plugin: clean-stage4-lto-plugin
-clean-stage4: clean-stage4-lto-plugin
-clean-stage4-lto-plugin:
+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 $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-lto-plugin/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage4-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/lto-plugin && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif lto-plugin-bootstrap
-
-
-.PHONY: all-stageprofile-lto-plugin maybe-all-stageprofile-lto-plugin
-.PHONY: clean-stageprofile-lto-plugin maybe-clean-stageprofile-lto-plugin
-maybe-all-stageprofile-lto-plugin:
-maybe-clean-stageprofile-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-all-stageprofile-lto-plugin: all-stageprofile-lto-plugin
-all-stageprofile: all-stageprofile-lto-plugin
-TARGET-stageprofile-lto-plugin = $(TARGET-lto-plugin)
-all-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
+       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)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGEprofile_CFLAGS)" \
-               CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
-               LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-lto-plugin)
+               $(TARGET-stageprofile-target-libsanitizer)
 
-maybe-clean-stageprofile-lto-plugin: clean-stageprofile-lto-plugin
-clean-stageprofile: clean-stageprofile-lto-plugin
-clean-stageprofile-lto-plugin:
+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 $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-lto-plugin/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/lto-plugin && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif lto-plugin-bootstrap
-
-
-.PHONY: all-stagefeedback-lto-plugin maybe-all-stagefeedback-lto-plugin
-.PHONY: clean-stagefeedback-lto-plugin maybe-clean-stagefeedback-lto-plugin
-maybe-all-stagefeedback-lto-plugin:
-maybe-clean-stagefeedback-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-all-stagefeedback-lto-plugin: all-stagefeedback-lto-plugin
-all-stagefeedback: all-stagefeedback-lto-plugin
-TARGET-stagefeedback-lto-plugin = $(TARGET-lto-plugin)
-all-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
+       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)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGEfeedback_CFLAGS)" \
-               CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
-               LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-lto-plugin)
+               $(TARGET-stagefeedback-target-libsanitizer)
 
-maybe-clean-stagefeedback-lto-plugin: clean-stagefeedback-lto-plugin
-clean-stagefeedback: clean-stagefeedback-lto-plugin
-clean-stagefeedback-lto-plugin:
+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 $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-lto-plugin/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/lto-plugin && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif lto-plugin-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-lto-plugin maybe-check-lto-plugin
-maybe-check-lto-plugin:
-@if lto-plugin
-maybe-check-lto-plugin: check-lto-plugin
 
-check-lto-plugin:
+.PHONY: check-target-libsanitizer maybe-check-target-libsanitizer
+maybe-check-target-libsanitizer:
+@if target-libsanitizer
+maybe-check-target-libsanitizer: check-target-libsanitizer
+
+check-target-libsanitizer:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(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 lto-plugin
+@endif target-libsanitizer
 
-.PHONY: install-lto-plugin maybe-install-lto-plugin
-maybe-install-lto-plugin:
-@if lto-plugin
-maybe-install-lto-plugin: install-lto-plugin
+.PHONY: install-target-libsanitizer maybe-install-target-libsanitizer
+maybe-install-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-target-libsanitizer: install-target-libsanitizer
 
-install-lto-plugin: installdirs
+install-target-libsanitizer: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif lto-plugin
+@endif target-libsanitizer
 
-.PHONY: install-strip-lto-plugin maybe-install-strip-lto-plugin
-maybe-install-strip-lto-plugin:
-@if lto-plugin
-maybe-install-strip-lto-plugin: install-strip-lto-plugin
+.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-lto-plugin: installdirs
+install-strip-target-libsanitizer: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif lto-plugin
+@endif target-libsanitizer
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-lto-plugin info-lto-plugin
-maybe-info-lto-plugin:
-@if lto-plugin
-maybe-info-lto-plugin: info-lto-plugin
+.PHONY: maybe-info-target-libsanitizer info-target-libsanitizer
+maybe-info-target-libsanitizer:
+@if target-libsanitizer
+maybe-info-target-libsanitizer: info-target-libsanitizer
 
-info-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+info-target-libsanitizer: \
+    configure-target-libsanitizer 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing info in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
+@endif target-libsanitizer
 
-.PHONY: maybe-dvi-lto-plugin dvi-lto-plugin
-maybe-dvi-lto-plugin:
-@if lto-plugin
-maybe-dvi-lto-plugin: dvi-lto-plugin
+.PHONY: maybe-dvi-target-libsanitizer dvi-target-libsanitizer
+maybe-dvi-target-libsanitizer:
+@if target-libsanitizer
+maybe-dvi-target-libsanitizer: dvi-target-libsanitizer
 
-dvi-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+dvi-target-libsanitizer: \
+    configure-target-libsanitizer 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing dvi in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
+@endif target-libsanitizer
 
-.PHONY: maybe-pdf-lto-plugin pdf-lto-plugin
-maybe-pdf-lto-plugin:
-@if lto-plugin
-maybe-pdf-lto-plugin: pdf-lto-plugin
+.PHONY: maybe-pdf-target-libsanitizer pdf-target-libsanitizer
+maybe-pdf-target-libsanitizer:
+@if target-libsanitizer
+maybe-pdf-target-libsanitizer: pdf-target-libsanitizer
 
-pdf-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+pdf-target-libsanitizer: \
+    configure-target-libsanitizer 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing pdf in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
+@endif target-libsanitizer
 
-.PHONY: maybe-html-lto-plugin html-lto-plugin
-maybe-html-lto-plugin:
-@if lto-plugin
-maybe-html-lto-plugin: html-lto-plugin
+.PHONY: maybe-html-target-libsanitizer html-target-libsanitizer
+maybe-html-target-libsanitizer:
+@if target-libsanitizer
+maybe-html-target-libsanitizer: html-target-libsanitizer
 
-html-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+html-target-libsanitizer: \
+    configure-target-libsanitizer 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing html in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
+@endif target-libsanitizer
 
-.PHONY: maybe-TAGS-lto-plugin TAGS-lto-plugin
-maybe-TAGS-lto-plugin:
-@if lto-plugin
-maybe-TAGS-lto-plugin: TAGS-lto-plugin
+.PHONY: maybe-TAGS-target-libsanitizer TAGS-target-libsanitizer
+maybe-TAGS-target-libsanitizer:
+@if target-libsanitizer
+maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer
 
-TAGS-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+TAGS-target-libsanitizer: \
+    configure-target-libsanitizer 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing TAGS in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
+@endif target-libsanitizer
 
-.PHONY: maybe-install-info-lto-plugin install-info-lto-plugin
-maybe-install-info-lto-plugin:
-@if lto-plugin
-maybe-install-info-lto-plugin: install-info-lto-plugin
+.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-lto-plugin: \
-    configure-lto-plugin \
-    info-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+install-info-target-libsanitizer: \
+    configure-target-libsanitizer \
+    info-target-libsanitizer 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing install-info in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
+@endif target-libsanitizer
 
-.PHONY: maybe-install-pdf-lto-plugin install-pdf-lto-plugin
-maybe-install-pdf-lto-plugin:
-@if lto-plugin
-maybe-install-pdf-lto-plugin: install-pdf-lto-plugin
+.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-lto-plugin: \
-    configure-lto-plugin \
-    pdf-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+install-pdf-target-libsanitizer: \
+    configure-target-libsanitizer \
+    pdf-target-libsanitizer 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing install-pdf in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
+@endif target-libsanitizer
 
-.PHONY: maybe-install-html-lto-plugin install-html-lto-plugin
-maybe-install-html-lto-plugin:
-@if lto-plugin
-maybe-install-html-lto-plugin: install-html-lto-plugin
+.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-lto-plugin: \
-    configure-lto-plugin \
-    html-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+install-html-target-libsanitizer: \
+    configure-target-libsanitizer \
+    html-target-libsanitizer 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing install-html in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
+@endif target-libsanitizer
 
-.PHONY: maybe-installcheck-lto-plugin installcheck-lto-plugin
-maybe-installcheck-lto-plugin:
-@if lto-plugin
-maybe-installcheck-lto-plugin: installcheck-lto-plugin
+.PHONY: maybe-installcheck-target-libsanitizer installcheck-target-libsanitizer
+maybe-installcheck-target-libsanitizer:
+@if target-libsanitizer
+maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer
 
-installcheck-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+installcheck-target-libsanitizer: \
+    configure-target-libsanitizer 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing installcheck in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
-
-.PHONY: maybe-mostlyclean-lto-plugin mostlyclean-lto-plugin
-maybe-mostlyclean-lto-plugin:
-@if lto-plugin
-maybe-mostlyclean-lto-plugin: mostlyclean-lto-plugin
+@endif target-libsanitizer
 
-mostlyclean-lto-plugin: 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+.PHONY: maybe-mostlyclean-target-libsanitizer mostlyclean-target-libsanitizer
+maybe-mostlyclean-target-libsanitizer:
+@if target-libsanitizer
+maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer
+
+mostlyclean-target-libsanitizer: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing mostlyclean in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
+@endif target-libsanitizer
 
-.PHONY: maybe-clean-lto-plugin clean-lto-plugin
-maybe-clean-lto-plugin:
-@if lto-plugin
-maybe-clean-lto-plugin: clean-lto-plugin
+.PHONY: maybe-clean-target-libsanitizer clean-target-libsanitizer
+maybe-clean-target-libsanitizer:
+@if target-libsanitizer
+maybe-clean-target-libsanitizer: clean-target-libsanitizer
 
-clean-lto-plugin: 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+clean-target-libsanitizer: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing clean in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
+@endif target-libsanitizer
 
-.PHONY: maybe-distclean-lto-plugin distclean-lto-plugin
-maybe-distclean-lto-plugin:
-@if lto-plugin
-maybe-distclean-lto-plugin: distclean-lto-plugin
+.PHONY: maybe-distclean-target-libsanitizer distclean-target-libsanitizer
+maybe-distclean-target-libsanitizer:
+@if target-libsanitizer
+maybe-distclean-target-libsanitizer: distclean-target-libsanitizer
 
-distclean-lto-plugin: 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+distclean-target-libsanitizer: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing distclean in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
+@endif target-libsanitizer
 
-.PHONY: maybe-maintainer-clean-lto-plugin maintainer-clean-lto-plugin
-maybe-maintainer-clean-lto-plugin:
-@if lto-plugin
-maybe-maintainer-clean-lto-plugin: maintainer-clean-lto-plugin
+.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-lto-plugin: 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+maintainer-clean-target-libsanitizer: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing maintainer-clean in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(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 lto-plugin
-
+@endif target-libsanitizer
 
 
-# ---------------------------------------
-# Modules which run on the target machine
-# ---------------------------------------
-
 
 
 
-.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
-maybe-configure-target-libstdc++-v3:
+.PHONY: configure-target-libvtv maybe-configure-target-libvtv
+maybe-configure-target-libvtv:
 @if gcc-bootstrap
-configure-target-libstdc++-v3: stage_current
+configure-target-libvtv: stage_current
 @endif gcc-bootstrap
-@if target-libstdc++-v3
-maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
-configure-target-libstdc++-v3
+@if target-libvtv
+maybe-configure-target-libvtv: configure-target-libvtv
+configure-target-libvtv
        @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; \
+       echo "Checking multilib configuration for libvtv..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
        $(RAW_CXX_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libvtv; \
+       cd "$(TARGET_SUBDIR)/libvtv" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
+       module_srcdir=libvtv; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
-@endif target-libstdc++-v3
+@endif target-libvtv
 
 
 
-.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-target-libvtv maybe-configure-stage1-target-libvtv
+maybe-configure-stage1-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-configure-stage1-target-libvtv: configure-stage1-target-libvtv
+configure-stage1-target-libvtv:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
        @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; \
+       echo "Checking multilib configuration for libvtv..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/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; \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libvtv ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       cd $(TARGET_SUBDIR)/libvtv || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libvtv; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif target-libvtv-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-target-libvtv maybe-configure-stage2-target-libvtv
+maybe-configure-stage2-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-configure-stage2-target-libvtv: configure-stage2-target-libvtv
+configure-stage2-target-libvtv:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
        @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; \
+       echo "Checking multilib configuration for libvtv..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/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; \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libvtv ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       cd $(TARGET_SUBDIR)/libvtv || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libvtv; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif target-libvtv-bootstrap
 
-.PHONY: configure-stage3-target-libstdc++-v3 maybe-configure-stage3-target-libstdc++-v3
-maybe-configure-stage3-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
-configure-stage3-target-libstdc++-v3:
+.PHONY: configure-stage3-target-libvtv maybe-configure-stage3-target-libvtv
+maybe-configure-stage3-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-configure-stage3-target-libvtv: configure-stage3-target-libvtv
+configure-stage3-target-libvtv:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
        @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; \
+       echo "Checking multilib configuration for libvtv..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/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; \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libvtv ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       cd $(TARGET_SUBDIR)/libvtv || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libvtv; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif target-libvtv-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-target-libvtv maybe-configure-stage4-target-libvtv
+maybe-configure-stage4-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-configure-stage4-target-libvtv: configure-stage4-target-libvtv
+configure-stage4-target-libvtv:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
        @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; \
+       echo "Checking multilib configuration for libvtv..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/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; \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libvtv ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       cd $(TARGET_SUBDIR)/libvtv || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libvtv; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif target-libvtv-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-target-libvtv maybe-configure-stageprofile-target-libvtv
+maybe-configure-stageprofile-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-configure-stageprofile-target-libvtv: configure-stageprofile-target-libvtv
+configure-stageprofile-target-libvtv:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
        @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; \
+       echo "Checking multilib configuration for libvtv..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/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; \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libvtv ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       cd $(TARGET_SUBDIR)/libvtv || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libvtv; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif target-libvtv-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-target-libvtv maybe-configure-stagefeedback-target-libvtv
+maybe-configure-stagefeedback-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-configure-stagefeedback-target-libvtv: configure-stagefeedback-target-libvtv
+configure-stagefeedback-target-libvtv:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
        @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; \
+       echo "Checking multilib configuration for libvtv..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/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; \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libvtv ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       cd $(TARGET_SUBDIR)/libvtv || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libvtv; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif target-libvtv-bootstrap
 
 
 
 
 
-.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
-maybe-all-target-libstdc++-v3:
+.PHONY: all-target-libvtv maybe-all-target-libvtv
+maybe-all-target-libvtv:
 @if gcc-bootstrap
-all-target-libstdc++-v3: stage_current
+all-target-libvtv: 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 target-libvtv
+TARGET-target-libvtv=all
+maybe-all-target-libvtv: all-target-libvtv
+all-target-libvtv: configure-target-libvtv
        @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
-
-
-
-.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
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(TARGET-target-libvtv))
+@endif target-libvtv
+
+
+
+.PHONY: all-stage1-target-libvtv maybe-all-stage1-target-libvtv
+.PHONY: clean-stage1-target-libvtv maybe-clean-stage1-target-libvtv
+maybe-all-stage1-target-libvtv:
+maybe-clean-stage1-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-all-stage1-target-libvtv: all-stage1-target-libvtv
+all-stage1: all-stage1-target-libvtv
+TARGET-stage1-target-libvtv = $(TARGET-target-libvtv)
+all-stage1-target-libvtv: configure-stage1-target-libvtv
        @[ $(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 && \
+       cd $(TARGET_SUBDIR)/libvtv && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -30366,41 +34491,42 @@ all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
                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_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+                 \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-target-libstdc++-v3)
+               $(TARGET-stage1-target-libvtv)
 
-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-target-libvtv: clean-stage1-target-libvtv
+clean-stage1: clean-stage1-target-libvtv
+clean-stage1-target-libvtv:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage1-libvtv/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libvtv && \
        $(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
+         clean
+@endif target-libvtv-bootstrap
+
+
+.PHONY: all-stage2-target-libvtv maybe-all-stage2-target-libvtv
+.PHONY: clean-stage2-target-libvtv maybe-clean-stage2-target-libvtv
+maybe-all-stage2-target-libvtv:
+maybe-clean-stage2-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-all-stage2-target-libvtv: all-stage2-target-libvtv
+all-stage2: all-stage2-target-libvtv
+TARGET-stage2-target-libvtv = $(TARGET-target-libvtv)
+all-stage2-target-libvtv: configure-stage2-target-libvtv
        @[ $(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 && \
+       cd $(TARGET_SUBDIR)/libvtv && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -30410,40 +34536,38 @@ all-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
                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-libstdc++-v3)
+               $(TARGET-stage2-target-libvtv)
 
-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-target-libvtv: clean-stage2-target-libvtv
+clean-stage2: clean-stage2-target-libvtv
+clean-stage2-target-libvtv:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage2-libvtv/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 $(TARGET_SUBDIR)/libvtv && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libvtv-bootstrap
+
+
+.PHONY: all-stage3-target-libvtv maybe-all-stage3-target-libvtv
+.PHONY: clean-stage3-target-libvtv maybe-clean-stage3-target-libvtv
+maybe-all-stage3-target-libvtv:
+maybe-clean-stage3-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-all-stage3-target-libvtv: all-stage3-target-libvtv
+all-stage3: all-stage3-target-libvtv
+TARGET-stage3-target-libvtv = $(TARGET-target-libvtv)
+all-stage3-target-libvtv: configure-stage3-target-libvtv
        @[ $(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 && \
+       cd $(TARGET_SUBDIR)/libvtv && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -30453,40 +34577,38 @@ all-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
                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-libstdc++-v3)
+               $(TARGET-stage3-target-libvtv)
 
-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-target-libvtv: clean-stage3-target-libvtv
+clean-stage3: clean-stage3-target-libvtv
+clean-stage3-target-libvtv:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage3-libvtv/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 $(TARGET_SUBDIR)/libvtv && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libvtv-bootstrap
+
+
+.PHONY: all-stage4-target-libvtv maybe-all-stage4-target-libvtv
+.PHONY: clean-stage4-target-libvtv maybe-clean-stage4-target-libvtv
+maybe-all-stage4-target-libvtv:
+maybe-clean-stage4-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-all-stage4-target-libvtv: all-stage4-target-libvtv
+all-stage4: all-stage4-target-libvtv
+TARGET-stage4-target-libvtv = $(TARGET-target-libvtv)
+all-stage4-target-libvtv: configure-stage4-target-libvtv
        @[ $(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 && \
+       cd $(TARGET_SUBDIR)/libvtv && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -30496,40 +34618,38 @@ all-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
                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-libstdc++-v3)
+               $(TARGET-stage4-target-libvtv)
 
-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-target-libvtv: clean-stage4-target-libvtv
+clean-stage4: clean-stage4-target-libvtv
+clean-stage4-target-libvtv:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage4-libvtv/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 $(TARGET_SUBDIR)/libvtv && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libvtv-bootstrap
+
+
+.PHONY: all-stageprofile-target-libvtv maybe-all-stageprofile-target-libvtv
+.PHONY: clean-stageprofile-target-libvtv maybe-clean-stageprofile-target-libvtv
+maybe-all-stageprofile-target-libvtv:
+maybe-clean-stageprofile-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-all-stageprofile-target-libvtv: all-stageprofile-target-libvtv
+all-stageprofile: all-stageprofile-target-libvtv
+TARGET-stageprofile-target-libvtv = $(TARGET-target-libvtv)
+all-stageprofile-target-libvtv: configure-stageprofile-target-libvtv
        @[ $(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 && \
+       cd $(TARGET_SUBDIR)/libvtv && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -30539,40 +34659,38 @@ all-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
                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-libstdc++-v3)
+               $(TARGET-stageprofile-target-libvtv)
 
-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-target-libvtv: clean-stageprofile-target-libvtv
+clean-stageprofile: clean-stageprofile-target-libvtv
+clean-stageprofile-target-libvtv:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libvtv/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-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 $(TARGET_SUBDIR)/libvtv && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libvtv-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libvtv maybe-all-stagefeedback-target-libvtv
+.PHONY: clean-stagefeedback-target-libvtv maybe-clean-stagefeedback-target-libvtv
+maybe-all-stagefeedback-target-libvtv:
+maybe-clean-stagefeedback-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-all-stagefeedback-target-libvtv: all-stagefeedback-target-libvtv
+all-stagefeedback: all-stagefeedback-target-libvtv
+TARGET-stagefeedback-target-libvtv = $(TARGET-target-libvtv)
+all-stagefeedback-target-libvtv: configure-stagefeedback-target-libvtv
        @[ $(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 && \
+       cd $(TARGET_SUBDIR)/libvtv && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -30582,92 +34700,90 @@ all-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-
                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-libstdc++-v3)
+               $(TARGET-stagefeedback-target-libvtv)
 
-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-target-libvtv: clean-stagefeedback-target-libvtv
+clean-stagefeedback: clean-stagefeedback-target-libvtv
+clean-stagefeedback-target-libvtv:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libvtv/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
+       cd $(TARGET_SUBDIR)/libvtv && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libvtv-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-target-libvtv maybe-check-target-libvtv
+maybe-check-target-libvtv:
+@if target-libvtv
+maybe-check-target-libvtv: check-target-libvtv
 
-check-target-libstdc++-v3:
+check-target-libvtv:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv maybe-install-target-libvtv
+maybe-install-target-libvtv:
+@if target-libvtv
+maybe-install-target-libvtv: install-target-libvtv
 
-install-target-libstdc++-v3: installdirs
+install-target-libvtv: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv maybe-install-strip-target-libvtv
+maybe-install-strip-target-libvtv:
+@if target-libvtv
+maybe-install-strip-target-libvtv: install-strip-target-libvtv
 
-install-strip-target-libstdc++-v3: installdirs
+install-strip-target-libvtv: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
 # 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-target-libvtv info-target-libvtv
+maybe-info-target-libvtv:
+@if target-libvtv
+maybe-info-target-libvtv: info-target-libvtv
 
-info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+info-target-libvtv: \
+    configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30675,25 +34791,25 @@ info-target-libstdc++-v3: \
                   info) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv dvi-target-libvtv
+maybe-dvi-target-libvtv:
+@if target-libvtv
+maybe-dvi-target-libvtv: dvi-target-libvtv
 
-dvi-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+dvi-target-libvtv: \
+    configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30701,25 +34817,25 @@ dvi-target-libstdc++-v3: \
                   dvi) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv pdf-target-libvtv
+maybe-pdf-target-libvtv:
+@if target-libvtv
+maybe-pdf-target-libvtv: pdf-target-libvtv
 
-pdf-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+pdf-target-libvtv: \
+    configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30727,25 +34843,25 @@ pdf-target-libstdc++-v3: \
                   pdf) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv html-target-libvtv
+maybe-html-target-libvtv:
+@if target-libvtv
+maybe-html-target-libvtv: html-target-libvtv
 
-html-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+html-target-libvtv: \
+    configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30753,25 +34869,25 @@ html-target-libstdc++-v3: \
                   html) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv TAGS-target-libvtv
+maybe-TAGS-target-libvtv:
+@if target-libvtv
+maybe-TAGS-target-libvtv: TAGS-target-libvtv
 
-TAGS-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+TAGS-target-libvtv: \
+    configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30779,26 +34895,26 @@ TAGS-target-libstdc++-v3: \
                   TAGS) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv install-info-target-libvtv
+maybe-install-info-target-libvtv:
+@if target-libvtv
+maybe-install-info-target-libvtv: install-info-target-libvtv
 
-install-info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    info-target-libstdc++-v3 
+install-info-target-libvtv: \
+    configure-target-libvtv \
+    info-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30806,26 +34922,26 @@ install-info-target-libstdc++-v3: \
                   install-info) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv install-pdf-target-libvtv
+maybe-install-pdf-target-libvtv:
+@if target-libvtv
+maybe-install-pdf-target-libvtv: install-pdf-target-libvtv
 
-install-pdf-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    pdf-target-libstdc++-v3 
+install-pdf-target-libvtv: \
+    configure-target-libvtv \
+    pdf-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30833,26 +34949,26 @@ install-pdf-target-libstdc++-v3: \
                   install-pdf) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv install-html-target-libvtv
+maybe-install-html-target-libvtv:
+@if target-libvtv
+maybe-install-html-target-libvtv: install-html-target-libvtv
 
-install-html-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    html-target-libstdc++-v3 
+install-html-target-libvtv: \
+    configure-target-libvtv \
+    html-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30860,25 +34976,25 @@ install-html-target-libstdc++-v3: \
                   install-html) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv installcheck-target-libvtv
+maybe-installcheck-target-libvtv:
+@if target-libvtv
+maybe-installcheck-target-libvtv: installcheck-target-libvtv
 
-installcheck-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+installcheck-target-libvtv: \
+    configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30886,24 +35002,24 @@ installcheck-target-libstdc++-v3: \
                   installcheck) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv mostlyclean-target-libvtv
+maybe-mostlyclean-target-libvtv:
+@if target-libvtv
+maybe-mostlyclean-target-libvtv: mostlyclean-target-libvtv
 
-mostlyclean-target-libstdc++-v3
+mostlyclean-target-libvtv
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30911,24 +35027,24 @@ mostlyclean-target-libstdc++-v3:
                   mostlyclean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv clean-target-libvtv
+maybe-clean-target-libvtv:
+@if target-libvtv
+maybe-clean-target-libvtv: clean-target-libvtv
 
-clean-target-libstdc++-v3
+clean-target-libvtv
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30936,24 +35052,24 @@ clean-target-libstdc++-v3:
                   clean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv distclean-target-libvtv
+maybe-distclean-target-libvtv:
+@if target-libvtv
+maybe-distclean-target-libvtv: distclean-target-libvtv
 
-distclean-target-libstdc++-v3
+distclean-target-libvtv
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30961,24 +35077,24 @@ distclean-target-libstdc++-v3:
                   distclean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
-.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-target-libvtv maintainer-clean-target-libvtv
+maybe-maintainer-clean-target-libvtv:
+@if target-libvtv
+maybe-maintainer-clean-target-libvtv: maintainer-clean-target-libvtv
 
-maintainer-clean-target-libstdc++-v3
+maintainer-clean-target-libvtv
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/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" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libvtv" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libvtv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30986,145 +35102,146 @@ maintainer-clean-target-libstdc++-v3:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libvtv
 
 
 
 
 
-.PHONY: configure-target-libmudflap maybe-configure-target-libmudflap
-maybe-configure-target-libmudflap:
+.PHONY: configure-target-libcilkrts maybe-configure-target-libcilkrts
+maybe-configure-target-libcilkrts:
 @if gcc-bootstrap
-configure-target-libmudflap: stage_current
+configure-target-libcilkrts: stage_current
 @endif gcc-bootstrap
-@if target-libmudflap
-maybe-configure-target-libmudflap: configure-target-libmudflap
-configure-target-libmudflap
+@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 libmudflap..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmudflap/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmudflap/multilib.tmp; \
+       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)/libmudflap/Makefile; \
-           mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libcilkrts/Makefile; \
+           mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
+         mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
+       test ! -f $(TARGET_SUBDIR)/libcilkrts/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts ; \
        $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libmudflap; \
-       cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libcilkrts; \
+       cd "$(TARGET_SUBDIR)/libcilkrts" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libmudflap/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libcilkrts/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libmudflap"; \
-       libsrcdir="$$s/libmudflap"; \
+       module_srcdir=libcilkrts; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
-@endif target-libmudflap
+@endif target-libcilkrts
 
 
 
 
 
-.PHONY: all-target-libmudflap maybe-all-target-libmudflap
-maybe-all-target-libmudflap:
+.PHONY: all-target-libcilkrts maybe-all-target-libcilkrts
+maybe-all-target-libcilkrts:
 @if gcc-bootstrap
-all-target-libmudflap: stage_current
+all-target-libcilkrts: stage_current
 @endif gcc-bootstrap
-@if target-libmudflap
-TARGET-target-libmudflap=all
-maybe-all-target-libmudflap: all-target-libmudflap
-all-target-libmudflap: configure-target-libmudflap
+@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)/libmudflap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libmudflap))
-@endif target-libmudflap
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libcilkrts))
+@endif target-libcilkrts
 
 
 
 
 
-.PHONY: check-target-libmudflap maybe-check-target-libmudflap
-maybe-check-target-libmudflap:
-@if target-libmudflap
-maybe-check-target-libmudflap: check-target-libmudflap
+.PHONY: check-target-libcilkrts maybe-check-target-libcilkrts
+maybe-check-target-libcilkrts:
+@if target-libcilkrts
+maybe-check-target-libcilkrts: check-target-libcilkrts
 
-check-target-libmudflap:
+check-target-libcilkrts:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: install-target-libmudflap maybe-install-target-libmudflap
-maybe-install-target-libmudflap:
-@if target-libmudflap
-maybe-install-target-libmudflap: install-target-libmudflap
+.PHONY: install-target-libcilkrts maybe-install-target-libcilkrts
+maybe-install-target-libcilkrts:
+@if target-libcilkrts
+maybe-install-target-libcilkrts: install-target-libcilkrts
 
-install-target-libmudflap: installdirs
+install-target-libcilkrts: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: install-strip-target-libmudflap maybe-install-strip-target-libmudflap
-maybe-install-strip-target-libmudflap:
-@if target-libmudflap
-maybe-install-strip-target-libmudflap: install-strip-target-libmudflap
+.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-libmudflap: installdirs
+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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libmudflap info-target-libmudflap
-maybe-info-target-libmudflap:
-@if target-libmudflap
-maybe-info-target-libmudflap: info-target-libmudflap
+.PHONY: maybe-info-target-libcilkrts info-target-libcilkrts
+maybe-info-target-libcilkrts:
+@if target-libcilkrts
+maybe-info-target-libcilkrts: info-target-libcilkrts
 
-info-target-libmudflap: \
-    configure-target-libmudflap 
+info-target-libcilkrts: \
+    configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31132,25 +35249,25 @@ info-target-libmudflap: \
                   info) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: maybe-dvi-target-libmudflap dvi-target-libmudflap
-maybe-dvi-target-libmudflap:
-@if target-libmudflap
-maybe-dvi-target-libmudflap: dvi-target-libmudflap
+.PHONY: maybe-dvi-target-libcilkrts dvi-target-libcilkrts
+maybe-dvi-target-libcilkrts:
+@if target-libcilkrts
+maybe-dvi-target-libcilkrts: dvi-target-libcilkrts
 
-dvi-target-libmudflap: \
-    configure-target-libmudflap 
+dvi-target-libcilkrts: \
+    configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31158,25 +35275,25 @@ dvi-target-libmudflap: \
                   dvi) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: maybe-pdf-target-libmudflap pdf-target-libmudflap
-maybe-pdf-target-libmudflap:
-@if target-libmudflap
-maybe-pdf-target-libmudflap: pdf-target-libmudflap
+.PHONY: maybe-pdf-target-libcilkrts pdf-target-libcilkrts
+maybe-pdf-target-libcilkrts:
+@if target-libcilkrts
+maybe-pdf-target-libcilkrts: pdf-target-libcilkrts
 
-pdf-target-libmudflap: \
-    configure-target-libmudflap 
+pdf-target-libcilkrts: \
+    configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31184,25 +35301,25 @@ pdf-target-libmudflap: \
                   pdf) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: maybe-html-target-libmudflap html-target-libmudflap
-maybe-html-target-libmudflap:
-@if target-libmudflap
-maybe-html-target-libmudflap: html-target-libmudflap
+.PHONY: maybe-html-target-libcilkrts html-target-libcilkrts
+maybe-html-target-libcilkrts:
+@if target-libcilkrts
+maybe-html-target-libcilkrts: html-target-libcilkrts
 
-html-target-libmudflap: \
-    configure-target-libmudflap 
+html-target-libcilkrts: \
+    configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31210,25 +35327,25 @@ html-target-libmudflap: \
                   html) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap
-maybe-TAGS-target-libmudflap:
-@if target-libmudflap
-maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
+.PHONY: maybe-TAGS-target-libcilkrts TAGS-target-libcilkrts
+maybe-TAGS-target-libcilkrts:
+@if target-libcilkrts
+maybe-TAGS-target-libcilkrts: TAGS-target-libcilkrts
 
-TAGS-target-libmudflap: \
-    configure-target-libmudflap 
+TAGS-target-libcilkrts: \
+    configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31236,26 +35353,26 @@ TAGS-target-libmudflap: \
                   TAGS) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: maybe-install-info-target-libmudflap install-info-target-libmudflap
-maybe-install-info-target-libmudflap:
-@if target-libmudflap
-maybe-install-info-target-libmudflap: install-info-target-libmudflap
+.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-libmudflap: \
-    configure-target-libmudflap \
-    info-target-libmudflap 
+install-info-target-libcilkrts: \
+    configure-target-libcilkrts \
+    info-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31263,26 +35380,26 @@ install-info-target-libmudflap: \
                   install-info) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: maybe-install-pdf-target-libmudflap install-pdf-target-libmudflap
-maybe-install-pdf-target-libmudflap:
-@if target-libmudflap
-maybe-install-pdf-target-libmudflap: install-pdf-target-libmudflap
+.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-libmudflap: \
-    configure-target-libmudflap \
-    pdf-target-libmudflap 
+install-pdf-target-libcilkrts: \
+    configure-target-libcilkrts \
+    pdf-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31290,26 +35407,26 @@ install-pdf-target-libmudflap: \
                   install-pdf) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: maybe-install-html-target-libmudflap install-html-target-libmudflap
-maybe-install-html-target-libmudflap:
-@if target-libmudflap
-maybe-install-html-target-libmudflap: install-html-target-libmudflap
+.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-libmudflap: \
-    configure-target-libmudflap \
-    html-target-libmudflap 
+install-html-target-libcilkrts: \
+    configure-target-libcilkrts \
+    html-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31317,25 +35434,25 @@ install-html-target-libmudflap: \
                   install-html) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: maybe-installcheck-target-libmudflap installcheck-target-libmudflap
-maybe-installcheck-target-libmudflap:
-@if target-libmudflap
-maybe-installcheck-target-libmudflap: installcheck-target-libmudflap
+.PHONY: maybe-installcheck-target-libcilkrts installcheck-target-libcilkrts
+maybe-installcheck-target-libcilkrts:
+@if target-libcilkrts
+maybe-installcheck-target-libcilkrts: installcheck-target-libcilkrts
 
-installcheck-target-libmudflap: \
-    configure-target-libmudflap 
+installcheck-target-libcilkrts: \
+    configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31343,24 +35460,24 @@ installcheck-target-libmudflap: \
                   installcheck) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: maybe-mostlyclean-target-libmudflap mostlyclean-target-libmudflap
-maybe-mostlyclean-target-libmudflap:
-@if target-libmudflap
-maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
+.PHONY: maybe-mostlyclean-target-libcilkrts mostlyclean-target-libcilkrts
+maybe-mostlyclean-target-libcilkrts:
+@if target-libcilkrts
+maybe-mostlyclean-target-libcilkrts: mostlyclean-target-libcilkrts
 
-mostlyclean-target-libmudflap
+mostlyclean-target-libcilkrts
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31368,24 +35485,24 @@ mostlyclean-target-libmudflap:
                   mostlyclean) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: maybe-clean-target-libmudflap clean-target-libmudflap
-maybe-clean-target-libmudflap:
-@if target-libmudflap
-maybe-clean-target-libmudflap: clean-target-libmudflap
+.PHONY: maybe-clean-target-libcilkrts clean-target-libcilkrts
+maybe-clean-target-libcilkrts:
+@if target-libcilkrts
+maybe-clean-target-libcilkrts: clean-target-libcilkrts
 
-clean-target-libmudflap
+clean-target-libcilkrts
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31393,24 +35510,24 @@ clean-target-libmudflap:
                   clean) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: maybe-distclean-target-libmudflap distclean-target-libmudflap
-maybe-distclean-target-libmudflap:
-@if target-libmudflap
-maybe-distclean-target-libmudflap: distclean-target-libmudflap
+.PHONY: maybe-distclean-target-libcilkrts distclean-target-libcilkrts
+maybe-distclean-target-libcilkrts:
+@if target-libcilkrts
+maybe-distclean-target-libcilkrts: distclean-target-libcilkrts
 
-distclean-target-libmudflap
+distclean-target-libcilkrts
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31418,24 +35535,24 @@ distclean-target-libmudflap:
                   distclean) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
-.PHONY: maybe-maintainer-clean-target-libmudflap maintainer-clean-target-libmudflap
-maybe-maintainer-clean-target-libmudflap:
-@if target-libmudflap
-maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap
+.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-libmudflap
+maintainer-clean-target-libcilkrts
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -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)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -31443,7 +35560,7 @@ maintainer-clean-target-libmudflap:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-libcilkrts
 
 
 
@@ -31483,12 +35600,13 @@ configure-target-libssp:
          *) topdir=`echo $(TARGET_SUBDIR)/libssp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libssp"; \
-       libsrcdir="$$s/libssp"; \
+       module_srcdir=libssp; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libssp
 
@@ -31510,7 +35628,7 @@ all-target-libssp: configure-target-libssp
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libssp))
 @endif target-libssp
 
@@ -31940,12 +36058,13 @@ configure-target-newlib:
          *) topdir=`echo $(TARGET_SUBDIR)/newlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/newlib"; \
-       libsrcdir="$$s/newlib"; \
+       module_srcdir=newlib; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-newlib
 
@@ -31967,7 +36086,7 @@ all-target-newlib: configure-target-newlib
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-newlib))
 @endif target-newlib
 
@@ -32396,12 +36515,13 @@ configure-target-libgcc:
          *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
+       module_srcdir=libgcc; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libgcc
 
@@ -32442,11 +36562,12 @@ configure-stage1-target-libgcc:
          *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
@@ -32486,12 +36607,12 @@ configure-stage2-target-libgcc:
          *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
@@ -32531,12 +36652,12 @@ configure-stage3-target-libgcc:
          *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
@@ -32576,12 +36697,12 @@ configure-stage4-target-libgcc:
          *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
@@ -32621,12 +36742,12 @@ configure-stageprofile-target-libgcc:
          *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
@@ -32666,12 +36787,12 @@ configure-stagefeedback-target-libgcc:
          *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
@@ -32692,7 +36813,7 @@ all-target-libgcc: configure-target-libgcc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libgcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libgcc))
 @endif target-libgcc
 
@@ -32720,7 +36841,8 @@ all-stage1-target-libgcc: configure-stage1-target-libgcc
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
+               $(EXTRA_TARGET_FLAGS)  \
+                 \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-target-libgcc)
 
@@ -32735,7 +36857,7 @@ clean-stage1-target-libgcc:
        fi; \
        cd $(TARGET_SUBDIR)/libgcc && \
        $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                clean
+         clean
 @endif target-libgcc-bootstrap
 
 
@@ -32776,9 +36898,7 @@ clean-stage2-target-libgcc:
          $(MAKE) stage2-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgcc-bootstrap
 
 
@@ -32819,9 +36939,7 @@ clean-stage3-target-libgcc:
          $(MAKE) stage3-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgcc-bootstrap
 
 
@@ -32862,9 +36980,7 @@ clean-stage4-target-libgcc:
          $(MAKE) stage4-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgcc-bootstrap
 
 
@@ -32905,9 +37021,7 @@ clean-stageprofile-target-libgcc:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgcc-bootstrap
 
 
@@ -32948,9 +37062,7 @@ clean-stagefeedback-target-libgcc:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgcc-bootstrap
 
 
@@ -33341,6 +37453,464 @@ maintainer-clean-target-libgcc:
 
 
 
+.PHONY: configure-target-libbacktrace maybe-configure-target-libbacktrace
+maybe-configure-target-libbacktrace:
+@if gcc-bootstrap
+configure-target-libbacktrace: stage_current
+@endif gcc-bootstrap
+@if target-libbacktrace
+maybe-configure-target-libbacktrace: configure-target-libbacktrace
+configure-target-libbacktrace: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libbacktrace..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libbacktrace/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libbacktrace/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libbacktrace/multilib.tmp $(TARGET_SUBDIR)/libbacktrace/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libbacktrace/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libbacktrace/Makefile; \
+           mv $(TARGET_SUBDIR)/libbacktrace/multilib.tmp $(TARGET_SUBDIR)/libbacktrace/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libbacktrace/multilib.tmp $(TARGET_SUBDIR)/libbacktrace/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libbacktrace/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace ; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libbacktrace; \
+       cd "$(TARGET_SUBDIR)/libbacktrace" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libbacktrace/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libbacktrace; \
+       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-libbacktrace
+
+
+
+
+
+.PHONY: all-target-libbacktrace maybe-all-target-libbacktrace
+maybe-all-target-libbacktrace:
+@if gcc-bootstrap
+all-target-libbacktrace: stage_current
+@endif gcc-bootstrap
+@if target-libbacktrace
+TARGET-target-libbacktrace=all
+maybe-all-target-libbacktrace: all-target-libbacktrace
+all-target-libbacktrace: configure-target-libbacktrace
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libbacktrace))
+@endif target-libbacktrace
+
+
+
+
+
+.PHONY: check-target-libbacktrace maybe-check-target-libbacktrace
+maybe-check-target-libbacktrace:
+@if target-libbacktrace
+maybe-check-target-libbacktrace: check-target-libbacktrace
+
+check-target-libbacktrace:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libbacktrace
+
+.PHONY: install-target-libbacktrace maybe-install-target-libbacktrace
+maybe-install-target-libbacktrace:
+@if target-libbacktrace
+maybe-install-target-libbacktrace: install-target-libbacktrace
+
+install-target-libbacktrace: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libbacktrace
+
+.PHONY: install-strip-target-libbacktrace maybe-install-strip-target-libbacktrace
+maybe-install-strip-target-libbacktrace:
+@if target-libbacktrace
+maybe-install-strip-target-libbacktrace: install-strip-target-libbacktrace
+
+install-strip-target-libbacktrace: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libbacktrace
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libbacktrace info-target-libbacktrace
+maybe-info-target-libbacktrace:
+@if target-libbacktrace
+maybe-info-target-libbacktrace: info-target-libbacktrace
+
+info-target-libbacktrace: \
+    configure-target-libbacktrace 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+.PHONY: maybe-dvi-target-libbacktrace dvi-target-libbacktrace
+maybe-dvi-target-libbacktrace:
+@if target-libbacktrace
+maybe-dvi-target-libbacktrace: dvi-target-libbacktrace
+
+dvi-target-libbacktrace: \
+    configure-target-libbacktrace 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+.PHONY: maybe-pdf-target-libbacktrace pdf-target-libbacktrace
+maybe-pdf-target-libbacktrace:
+@if target-libbacktrace
+maybe-pdf-target-libbacktrace: pdf-target-libbacktrace
+
+pdf-target-libbacktrace: \
+    configure-target-libbacktrace 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+.PHONY: maybe-html-target-libbacktrace html-target-libbacktrace
+maybe-html-target-libbacktrace:
+@if target-libbacktrace
+maybe-html-target-libbacktrace: html-target-libbacktrace
+
+html-target-libbacktrace: \
+    configure-target-libbacktrace 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+.PHONY: maybe-TAGS-target-libbacktrace TAGS-target-libbacktrace
+maybe-TAGS-target-libbacktrace:
+@if target-libbacktrace
+maybe-TAGS-target-libbacktrace: TAGS-target-libbacktrace
+
+TAGS-target-libbacktrace: \
+    configure-target-libbacktrace 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+.PHONY: maybe-install-info-target-libbacktrace install-info-target-libbacktrace
+maybe-install-info-target-libbacktrace:
+@if target-libbacktrace
+maybe-install-info-target-libbacktrace: install-info-target-libbacktrace
+
+install-info-target-libbacktrace: \
+    configure-target-libbacktrace \
+    info-target-libbacktrace 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+.PHONY: maybe-install-pdf-target-libbacktrace install-pdf-target-libbacktrace
+maybe-install-pdf-target-libbacktrace:
+@if target-libbacktrace
+maybe-install-pdf-target-libbacktrace: install-pdf-target-libbacktrace
+
+install-pdf-target-libbacktrace: \
+    configure-target-libbacktrace \
+    pdf-target-libbacktrace 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+.PHONY: maybe-install-html-target-libbacktrace install-html-target-libbacktrace
+maybe-install-html-target-libbacktrace:
+@if target-libbacktrace
+maybe-install-html-target-libbacktrace: install-html-target-libbacktrace
+
+install-html-target-libbacktrace: \
+    configure-target-libbacktrace \
+    html-target-libbacktrace 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+.PHONY: maybe-installcheck-target-libbacktrace installcheck-target-libbacktrace
+maybe-installcheck-target-libbacktrace:
+@if target-libbacktrace
+maybe-installcheck-target-libbacktrace: installcheck-target-libbacktrace
+
+installcheck-target-libbacktrace: \
+    configure-target-libbacktrace 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+.PHONY: maybe-mostlyclean-target-libbacktrace mostlyclean-target-libbacktrace
+maybe-mostlyclean-target-libbacktrace:
+@if target-libbacktrace
+maybe-mostlyclean-target-libbacktrace: mostlyclean-target-libbacktrace
+
+mostlyclean-target-libbacktrace: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+.PHONY: maybe-clean-target-libbacktrace clean-target-libbacktrace
+maybe-clean-target-libbacktrace:
+@if target-libbacktrace
+maybe-clean-target-libbacktrace: clean-target-libbacktrace
+
+clean-target-libbacktrace: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+.PHONY: maybe-distclean-target-libbacktrace distclean-target-libbacktrace
+maybe-distclean-target-libbacktrace:
+@if target-libbacktrace
+maybe-distclean-target-libbacktrace: distclean-target-libbacktrace
+
+distclean-target-libbacktrace: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+.PHONY: maybe-maintainer-clean-target-libbacktrace maintainer-clean-target-libbacktrace
+maybe-maintainer-clean-target-libbacktrace:
+@if target-libbacktrace
+maybe-maintainer-clean-target-libbacktrace: maintainer-clean-target-libbacktrace
+
+maintainer-clean-target-libbacktrace: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(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-libbacktrace
+
+
+
+
+
 .PHONY: configure-target-libquadmath maybe-configure-target-libquadmath
 maybe-configure-target-libquadmath:
 @if gcc-bootstrap
@@ -33375,12 +37945,13 @@ configure-target-libquadmath:
          *) topdir=`echo $(TARGET_SUBDIR)/libquadmath/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libquadmath"; \
-       libsrcdir="$$s/libquadmath"; \
+       module_srcdir=libquadmath; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libquadmath
 
@@ -33402,7 +37973,7 @@ all-target-libquadmath: configure-target-libquadmath
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libquadmath && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libquadmath))
 @endif target-libquadmath
 
@@ -33832,12 +38403,13 @@ configure-target-libgfortran:
          *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgfortran"; \
-       libsrcdir="$$s/libgfortran"; \
+       module_srcdir=libgfortran; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libgfortran
 
@@ -33859,7 +38431,7 @@ all-target-libgfortran: configure-target-libgfortran
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libgfortran && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libgfortran))
 @endif target-libgfortran
 
@@ -34289,12 +38861,13 @@ configure-target-libobjc:
          *) topdir=`echo $(TARGET_SUBDIR)/libobjc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libobjc"; \
-       libsrcdir="$$s/libobjc"; \
+       module_srcdir=libobjc; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libobjc
 
@@ -34316,7 +38889,7 @@ all-target-libobjc: configure-target-libobjc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libobjc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libobjc))
 @endif target-libobjc
 
@@ -34746,12 +39319,13 @@ configure-target-libgo:
          *) topdir=`echo $(TARGET_SUBDIR)/libgo/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgo"; \
-       libsrcdir="$$s/libgo"; \
+       module_srcdir=libgo; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libgo
 
@@ -34773,7 +39347,7 @@ all-target-libgo: configure-target-libgo
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libgo && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libgo))
 @endif target-libgo
 
@@ -35203,12 +39777,13 @@ configure-target-libtermcap:
          *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libtermcap"; \
-       libsrcdir="$$s/libtermcap"; \
+       module_srcdir=libtermcap; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libtermcap
 
@@ -35230,7 +39805,7 @@ all-target-libtermcap: configure-target-libtermcap
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libtermcap))
 @endif target-libtermcap
 
@@ -35595,12 +40170,13 @@ configure-target-winsup:
          *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/winsup"; \
-       libsrcdir="$$s/winsup"; \
+       module_srcdir=winsup; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-winsup
 
@@ -35622,7 +40198,7 @@ all-target-winsup: configure-target-winsup
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/winsup && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-winsup))
 @endif target-winsup
 
@@ -36052,12 +40628,13 @@ configure-target-libgloss:
          *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgloss"; \
-       libsrcdir="$$s/libgloss"; \
+       module_srcdir=libgloss; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libgloss
 
@@ -36079,7 +40656,7 @@ all-target-libgloss: configure-target-libgloss
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libgloss))
 @endif target-libgloss
 
@@ -36504,12 +41081,13 @@ configure-target-libffi:
          *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libffi"; \
-       libsrcdir="$$s/libffi"; \
+       module_srcdir=libffi; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libffi
 
@@ -36531,7 +41109,7 @@ all-target-libffi: configure-target-libffi
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libffi))
 @endif target-libffi
 
@@ -36559,13 +41137,8 @@ maybe-install-target-libffi:
 @if target-libffi
 maybe-install-target-libffi: install-target-libffi
 
-install-target-libffi: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+# Dummy target for uninstallable.
+install-target-libffi:
 
 @endif target-libffi
 
@@ -36574,13 +41147,8 @@ maybe-install-strip-target-libffi:
 @if target-libffi
 maybe-install-strip-target-libffi: install-strip-target-libffi
 
-install-strip-target-libffi: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+# Dummy target for uninstallable.
+install-strip-target-libffi:
 
 @endif target-libffi
 
@@ -36961,12 +41529,13 @@ configure-target-libjava:
          *) topdir=`echo $(TARGET_SUBDIR)/libjava/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libjava"; \
-       libsrcdir="$$s/libjava"; \
+       module_srcdir=libjava; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption} $(EXTRA_CONFIGARGS_LIBJAVA) \
+         --target=${target_alias} $(EXTRA_CONFIGARGS_LIBJAVA) \
          || exit 1
 @endif target-libjava
 
@@ -36988,7 +41557,7 @@ all-target-libjava: configure-target-libjava
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
                $(TARGET-target-libjava))
 @endif target-libjava
 
@@ -37418,12 +41987,13 @@ configure-target-zlib:
          *) topdir=`echo $(TARGET_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
+       module_srcdir=zlib; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-zlib
 
@@ -37445,7 +42015,7 @@ all-target-zlib: configure-target-zlib
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-zlib))
 @endif target-zlib
 
@@ -37875,12 +42445,13 @@ configure-target-boehm-gc:
          *) topdir=`echo $(TARGET_SUBDIR)/boehm-gc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/boehm-gc"; \
-       libsrcdir="$$s/boehm-gc"; \
+       module_srcdir=boehm-gc; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-boehm-gc
 
@@ -37902,7 +42473,7 @@ all-target-boehm-gc: configure-target-boehm-gc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-boehm-gc))
 @endif target-boehm-gc
 
@@ -38332,12 +42903,13 @@ configure-target-rda:
          *) topdir=`echo $(TARGET_SUBDIR)/rda/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/rda"; \
-       libsrcdir="$$s/rda"; \
+       module_srcdir=rda; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-rda
 
@@ -38359,7 +42931,7 @@ all-target-rda: configure-target-rda
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-rda))
 @endif target-rda
 
@@ -38789,12 +43361,13 @@ configure-target-libada:
          *) topdir=`echo $(TARGET_SUBDIR)/libada/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libada"; \
-       libsrcdir="$$s/libada"; \
+       module_srcdir=libada; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libada
 
@@ -38816,7 +43389,7 @@ all-target-libada: configure-target-libada
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libada && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libada))
 @endif target-libada
 
@@ -39245,12 +43818,13 @@ configure-target-libgomp:
          *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
+       module_srcdir=libgomp; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libgomp
 
@@ -39291,11 +43865,12 @@ configure-stage1-target-libgomp:
          *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgomp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
@@ -39335,12 +43910,12 @@ configure-stage2-target-libgomp:
          *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgomp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
@@ -39380,12 +43955,12 @@ configure-stage3-target-libgomp:
          *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgomp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
@@ -39425,12 +44000,12 @@ configure-stage4-target-libgomp:
          *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgomp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
@@ -39470,12 +44045,12 @@ configure-stageprofile-target-libgomp:
          *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgomp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
@@ -39515,12 +44090,12 @@ configure-stagefeedback-target-libgomp:
          *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgomp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
+         --target=${target_alias} \
+          --with-build-libsubdir=$(HOST_SUBDIR)  \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
@@ -39541,7 +44116,7 @@ all-target-libgomp: configure-target-libgomp
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libgomp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libgomp))
 @endif target-libgomp
 
@@ -39569,7 +44144,8 @@ all-stage1-target-libgomp: configure-stage1-target-libgomp
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
+               $(EXTRA_TARGET_FLAGS)  \
+                 \
                TFLAGS="$(STAGE1_TFLAGS)" \
                $(TARGET-stage1-target-libgomp)
 
@@ -39584,7 +44160,7 @@ clean-stage1-target-libgomp:
        fi; \
        cd $(TARGET_SUBDIR)/libgomp && \
        $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                clean
+         clean
 @endif target-libgomp-bootstrap
 
 
@@ -39625,9 +44201,7 @@ clean-stage2-target-libgomp:
          $(MAKE) stage2-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgomp && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgomp-bootstrap
 
 
@@ -39668,9 +44242,7 @@ clean-stage3-target-libgomp:
          $(MAKE) stage3-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgomp && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgomp-bootstrap
 
 
@@ -39711,9 +44283,7 @@ clean-stage4-target-libgomp:
          $(MAKE) stage4-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgomp && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgomp-bootstrap
 
 
@@ -39754,9 +44324,7 @@ clean-stageprofile-target-libgomp:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgomp && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgomp-bootstrap
 
 
@@ -39797,9 +44365,7 @@ clean-stagefeedback-target-libgomp:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgomp && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgomp-bootstrap
 
 
@@ -40229,12 +44795,13 @@ configure-target-libitm:
          *) topdir=`echo $(TARGET_SUBDIR)/libitm/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libitm"; \
-       libsrcdir="$$s/libitm"; \
+       module_srcdir=libitm; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libitm
 
@@ -40256,7 +44823,7 @@ all-target-libitm: configure-target-libitm
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libitm && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libitm))
 @endif target-libitm
 
@@ -40686,12 +45253,13 @@ configure-target-libatomic:
          *) topdir=`echo $(TARGET_SUBDIR)/libatomic/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libatomic"; \
-       libsrcdir="$$s/libatomic"; \
+       module_srcdir=libatomic; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       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} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libatomic
 
@@ -40713,7 +45281,7 @@ all-target-libatomic: configure-target-libatomic
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libatomic && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libatomic))
 @endif target-libatomic
 
@@ -41107,13 +45675,6 @@ maintainer-clean-target-libatomic:
 
 
 
-@if target-libmudflap
-.PHONY: check-target-libmudflap-c++
-check-target-libmudflap-c++:
-       $(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++frags.exp" check-target-libmudflap
-
-@endif target-libmudflap
-
 @if target-libgomp
 .PHONY: check-target-libgomp-c++
 check-target-libgomp-c++:
@@ -41162,7 +45723,7 @@ check-gcc-c++:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++);
-check-c++: check-gcc-c++ check-target-libstdc++-v3 check-target-libmudflap-c++ check-target-libitm-c++ check-target-libgomp-c++
+check-c++: check-gcc-c++ check-target-libstdc++-v3 check-target-libitm-c++ check-target-libgomp-c++
 
 .PHONY: check-gcc-fortran check-fortran
 check-gcc-fortran:
@@ -41299,6 +45860,11 @@ stage1-start::
          mkdir stage1-binutils; \
        mv stage1-binutils binutils 
 @endif binutils
+@if fixincludes
+       @cd $(HOST_SUBDIR); [ -d stage1-fixincludes ] || \
+         mkdir stage1-fixincludes; \
+       mv stage1-fixincludes fixincludes 
+@endif fixincludes
 @if gas
        @cd $(HOST_SUBDIR); [ -d stage1-gas ] || \
          mkdir stage1-gas; \
@@ -41354,6 +45920,11 @@ stage1-start::
          mkdir stage1-ld; \
        mv stage1-ld ld 
 @endif ld
+@if libbacktrace
+       @cd $(HOST_SUBDIR); [ -d stage1-libbacktrace ] || \
+         mkdir stage1-libbacktrace; \
+       mv stage1-libbacktrace libbacktrace 
+@endif libbacktrace
 @if libcpp
        @cd $(HOST_SUBDIR); [ -d stage1-libcpp ] || \
          mkdir stage1-libcpp; \
@@ -41369,6 +45940,11 @@ stage1-start::
          mkdir stage1-libiberty; \
        mv stage1-libiberty libiberty 
 @endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stage1-libiberty-linker-plugin ] || \
+         mkdir stage1-libiberty-linker-plugin; \
+       mv stage1-libiberty-linker-plugin libiberty-linker-plugin 
+@endif libiberty-linker-plugin
 @if zlib
        @cd $(HOST_SUBDIR); [ -d stage1-zlib ] || \
          mkdir stage1-zlib; \
@@ -41399,6 +45975,11 @@ stage1-end::
          cd $(HOST_SUBDIR); mv binutils stage1-binutils  ; \
        fi
 @endif binutils
+@if fixincludes
+       @if test -d $(HOST_SUBDIR)/fixincludes ; then \
+         cd $(HOST_SUBDIR); mv fixincludes stage1-fixincludes  ; \
+       fi
+@endif fixincludes
 @if gas
        @if test -d $(HOST_SUBDIR)/gas ; then \
          cd $(HOST_SUBDIR); mv gas stage1-gas  ; \
@@ -41454,6 +46035,11 @@ stage1-end::
          cd $(HOST_SUBDIR); mv ld stage1-ld  ; \
        fi
 @endif ld
+@if libbacktrace
+       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stage1-libbacktrace  ; \
+       fi
+@endif libbacktrace
 @if libcpp
        @if test -d $(HOST_SUBDIR)/libcpp ; then \
          cd $(HOST_SUBDIR); mv libcpp stage1-libcpp  ; \
@@ -41469,6 +46055,11 @@ stage1-end::
          cd $(HOST_SUBDIR); mv libiberty stage1-libiberty  ; \
        fi
 @endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin ; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage1-libiberty-linker-plugin  ; \
+       fi
+@endif libiberty-linker-plugin
 @if zlib
        @if test -d $(HOST_SUBDIR)/zlib ; then \
          cd $(HOST_SUBDIR); mv zlib stage1-zlib  ; \
@@ -41545,6 +46136,12 @@ stage2-start::
        mv stage2-binutils binutils  ; \
        mv stage1-binutils prev-binutils || test -f stage1-lean 
 @endif binutils
+@if fixincludes
+       @cd $(HOST_SUBDIR); [ -d stage2-fixincludes ] || \
+         mkdir stage2-fixincludes; \
+       mv stage2-fixincludes fixincludes  ; \
+       mv stage1-fixincludes prev-fixincludes || test -f stage1-lean 
+@endif fixincludes
 @if gas
        @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
          mkdir stage2-gas; \
@@ -41611,6 +46208,12 @@ stage2-start::
        mv stage2-ld ld  ; \
        mv stage1-ld prev-ld || test -f stage1-lean 
 @endif ld
+@if libbacktrace
+       @cd $(HOST_SUBDIR); [ -d stage2-libbacktrace ] || \
+         mkdir stage2-libbacktrace; \
+       mv stage2-libbacktrace libbacktrace  ; \
+       mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
+@endif libbacktrace
 @if libcpp
        @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
          mkdir stage2-libcpp; \
@@ -41629,6 +46232,12 @@ stage2-start::
        mv stage2-libiberty libiberty  ; \
        mv stage1-libiberty prev-libiberty || test -f stage1-lean 
 @endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stage2-libiberty-linker-plugin ] || \
+         mkdir stage2-libiberty-linker-plugin; \
+       mv stage2-libiberty-linker-plugin libiberty-linker-plugin  ; \
+       mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean 
+@endif libiberty-linker-plugin
 @if zlib
        @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
          mkdir stage2-zlib; \
@@ -41665,6 +46274,12 @@ stage2-end::
          mv prev-binutils stage1-binutils ; :  ; \
        fi
 @endif binutils
+@if fixincludes
+       @if test -d $(HOST_SUBDIR)/fixincludes ; then \
+         cd $(HOST_SUBDIR); mv fixincludes stage2-fixincludes ; \
+         mv prev-fixincludes stage1-fixincludes ; :  ; \
+       fi
+@endif fixincludes
 @if gas
        @if test -d $(HOST_SUBDIR)/gas ; then \
          cd $(HOST_SUBDIR); mv gas stage2-gas ; \
@@ -41731,6 +46346,12 @@ stage2-end::
          mv prev-ld stage1-ld ; :  ; \
        fi
 @endif ld
+@if libbacktrace
+       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stage2-libbacktrace ; \
+         mv prev-libbacktrace stage1-libbacktrace ; :  ; \
+       fi
+@endif libbacktrace
 @if libcpp
        @if test -d $(HOST_SUBDIR)/libcpp ; then \
          cd $(HOST_SUBDIR); mv libcpp stage2-libcpp ; \
@@ -41749,6 +46370,12 @@ stage2-end::
          mv prev-libiberty stage1-libiberty ; :  ; \
        fi
 @endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin ; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage2-libiberty-linker-plugin ; \
+         mv prev-libiberty-linker-plugin stage1-libiberty-linker-plugin ; :  ; \
+       fi
+@endif libiberty-linker-plugin
 @if zlib
        @if test -d $(HOST_SUBDIR)/zlib ; then \
          cd $(HOST_SUBDIR); mv zlib stage2-zlib ; \
@@ -41851,6 +46478,12 @@ stage3-start::
        mv stage3-binutils binutils  ; \
        mv stage2-binutils prev-binutils || test -f stage2-lean 
 @endif binutils
+@if fixincludes
+       @cd $(HOST_SUBDIR); [ -d stage3-fixincludes ] || \
+         mkdir stage3-fixincludes; \
+       mv stage3-fixincludes fixincludes  ; \
+       mv stage2-fixincludes prev-fixincludes || test -f stage2-lean 
+@endif fixincludes
 @if gas
        @cd $(HOST_SUBDIR); [ -d stage3-gas ] || \
          mkdir stage3-gas; \
@@ -41917,6 +46550,12 @@ stage3-start::
        mv stage3-ld ld  ; \
        mv stage2-ld prev-ld || test -f stage2-lean 
 @endif ld
+@if libbacktrace
+       @cd $(HOST_SUBDIR); [ -d stage3-libbacktrace ] || \
+         mkdir stage3-libbacktrace; \
+       mv stage3-libbacktrace libbacktrace  ; \
+       mv stage2-libbacktrace prev-libbacktrace || test -f stage2-lean 
+@endif libbacktrace
 @if libcpp
        @cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \
          mkdir stage3-libcpp; \
@@ -41935,6 +46574,12 @@ stage3-start::
        mv stage3-libiberty libiberty  ; \
        mv stage2-libiberty prev-libiberty || test -f stage2-lean 
 @endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stage3-libiberty-linker-plugin ] || \
+         mkdir stage3-libiberty-linker-plugin; \
+       mv stage3-libiberty-linker-plugin libiberty-linker-plugin  ; \
+       mv stage2-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage2-lean 
+@endif libiberty-linker-plugin
 @if zlib
        @cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \
          mkdir stage3-zlib; \
@@ -41971,6 +46616,12 @@ stage3-end::
          mv prev-binutils stage2-binutils ; :  ; \
        fi
 @endif binutils
+@if fixincludes
+       @if test -d $(HOST_SUBDIR)/fixincludes ; then \
+         cd $(HOST_SUBDIR); mv fixincludes stage3-fixincludes ; \
+         mv prev-fixincludes stage2-fixincludes ; :  ; \
+       fi
+@endif fixincludes
 @if gas
        @if test -d $(HOST_SUBDIR)/gas ; then \
          cd $(HOST_SUBDIR); mv gas stage3-gas ; \
@@ -42037,6 +46688,12 @@ stage3-end::
          mv prev-ld stage2-ld ; :  ; \
        fi
 @endif ld
+@if libbacktrace
+       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stage3-libbacktrace ; \
+         mv prev-libbacktrace stage2-libbacktrace ; :  ; \
+       fi
+@endif libbacktrace
 @if libcpp
        @if test -d $(HOST_SUBDIR)/libcpp ; then \
          cd $(HOST_SUBDIR); mv libcpp stage3-libcpp ; \
@@ -42055,6 +46712,12 @@ stage3-end::
          mv prev-libiberty stage2-libiberty ; :  ; \
        fi
 @endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin ; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage3-libiberty-linker-plugin ; \
+         mv prev-libiberty-linker-plugin stage2-libiberty-linker-plugin ; :  ; \
+       fi
+@endif libiberty-linker-plugin
 @if zlib
        @if test -d $(HOST_SUBDIR)/zlib ; then \
          cd $(HOST_SUBDIR); mv zlib stage3-zlib ; \
@@ -42213,6 +46876,12 @@ stage4-start::
        mv stage4-binutils binutils  ; \
        mv stage3-binutils prev-binutils || test -f stage3-lean 
 @endif binutils
+@if fixincludes
+       @cd $(HOST_SUBDIR); [ -d stage4-fixincludes ] || \
+         mkdir stage4-fixincludes; \
+       mv stage4-fixincludes fixincludes  ; \
+       mv stage3-fixincludes prev-fixincludes || test -f stage3-lean 
+@endif fixincludes
 @if gas
        @cd $(HOST_SUBDIR); [ -d stage4-gas ] || \
          mkdir stage4-gas; \
@@ -42279,6 +46948,12 @@ stage4-start::
        mv stage4-ld ld  ; \
        mv stage3-ld prev-ld || test -f stage3-lean 
 @endif ld
+@if libbacktrace
+       @cd $(HOST_SUBDIR); [ -d stage4-libbacktrace ] || \
+         mkdir stage4-libbacktrace; \
+       mv stage4-libbacktrace libbacktrace  ; \
+       mv stage3-libbacktrace prev-libbacktrace || test -f stage3-lean 
+@endif libbacktrace
 @if libcpp
        @cd $(HOST_SUBDIR); [ -d stage4-libcpp ] || \
          mkdir stage4-libcpp; \
@@ -42297,6 +46972,12 @@ stage4-start::
        mv stage4-libiberty libiberty  ; \
        mv stage3-libiberty prev-libiberty || test -f stage3-lean 
 @endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stage4-libiberty-linker-plugin ] || \
+         mkdir stage4-libiberty-linker-plugin; \
+       mv stage4-libiberty-linker-plugin libiberty-linker-plugin  ; \
+       mv stage3-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage3-lean 
+@endif libiberty-linker-plugin
 @if zlib
        @cd $(HOST_SUBDIR); [ -d stage4-zlib ] || \
          mkdir stage4-zlib; \
@@ -42333,6 +47014,12 @@ stage4-end::
          mv prev-binutils stage3-binutils ; :  ; \
        fi
 @endif binutils
+@if fixincludes
+       @if test -d $(HOST_SUBDIR)/fixincludes ; then \
+         cd $(HOST_SUBDIR); mv fixincludes stage4-fixincludes ; \
+         mv prev-fixincludes stage3-fixincludes ; :  ; \
+       fi
+@endif fixincludes
 @if gas
        @if test -d $(HOST_SUBDIR)/gas ; then \
          cd $(HOST_SUBDIR); mv gas stage4-gas ; \
@@ -42399,6 +47086,12 @@ stage4-end::
          mv prev-ld stage3-ld ; :  ; \
        fi
 @endif ld
+@if libbacktrace
+       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stage4-libbacktrace ; \
+         mv prev-libbacktrace stage3-libbacktrace ; :  ; \
+       fi
+@endif libbacktrace
 @if libcpp
        @if test -d $(HOST_SUBDIR)/libcpp ; then \
          cd $(HOST_SUBDIR); mv libcpp stage4-libcpp ; \
@@ -42417,6 +47110,12 @@ stage4-end::
          mv prev-libiberty stage3-libiberty ; :  ; \
        fi
 @endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin ; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage4-libiberty-linker-plugin ; \
+         mv prev-libiberty-linker-plugin stage3-libiberty-linker-plugin ; :  ; \
+       fi
+@endif libiberty-linker-plugin
 @if zlib
        @if test -d $(HOST_SUBDIR)/zlib ; then \
          cd $(HOST_SUBDIR); mv zlib stage4-zlib ; \
@@ -42563,6 +47262,12 @@ stageprofile-start::
        mv stageprofile-binutils binutils  ; \
        mv stage1-binutils prev-binutils || test -f stage1-lean 
 @endif binutils
+@if fixincludes
+       @cd $(HOST_SUBDIR); [ -d stageprofile-fixincludes ] || \
+         mkdir stageprofile-fixincludes; \
+       mv stageprofile-fixincludes fixincludes  ; \
+       mv stage1-fixincludes prev-fixincludes || test -f stage1-lean 
+@endif fixincludes
 @if gas
        @cd $(HOST_SUBDIR); [ -d stageprofile-gas ] || \
          mkdir stageprofile-gas; \
@@ -42629,6 +47334,12 @@ stageprofile-start::
        mv stageprofile-ld ld  ; \
        mv stage1-ld prev-ld || test -f stage1-lean 
 @endif ld
+@if libbacktrace
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libbacktrace ] || \
+         mkdir stageprofile-libbacktrace; \
+       mv stageprofile-libbacktrace libbacktrace  ; \
+       mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
+@endif libbacktrace
 @if libcpp
        @cd $(HOST_SUBDIR); [ -d stageprofile-libcpp ] || \
          mkdir stageprofile-libcpp; \
@@ -42647,6 +47358,12 @@ stageprofile-start::
        mv stageprofile-libiberty libiberty  ; \
        mv stage1-libiberty prev-libiberty || test -f stage1-lean 
 @endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libiberty-linker-plugin ] || \
+         mkdir stageprofile-libiberty-linker-plugin; \
+       mv stageprofile-libiberty-linker-plugin libiberty-linker-plugin  ; \
+       mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean 
+@endif libiberty-linker-plugin
 @if zlib
        @cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \
          mkdir stageprofile-zlib; \
@@ -42683,6 +47400,12 @@ stageprofile-end::
          mv prev-binutils stage1-binutils ; :  ; \
        fi
 @endif binutils
+@if fixincludes
+       @if test -d $(HOST_SUBDIR)/fixincludes ; then \
+         cd $(HOST_SUBDIR); mv fixincludes stageprofile-fixincludes ; \
+         mv prev-fixincludes stage1-fixincludes ; :  ; \
+       fi
+@endif fixincludes
 @if gas
        @if test -d $(HOST_SUBDIR)/gas ; then \
          cd $(HOST_SUBDIR); mv gas stageprofile-gas ; \
@@ -42749,6 +47472,12 @@ stageprofile-end::
          mv prev-ld stage1-ld ; :  ; \
        fi
 @endif ld
+@if libbacktrace
+       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stageprofile-libbacktrace ; \
+         mv prev-libbacktrace stage1-libbacktrace ; :  ; \
+       fi
+@endif libbacktrace
 @if libcpp
        @if test -d $(HOST_SUBDIR)/libcpp ; then \
          cd $(HOST_SUBDIR); mv libcpp stageprofile-libcpp ; \
@@ -42767,6 +47496,12 @@ stageprofile-end::
          mv prev-libiberty stage1-libiberty ; :  ; \
        fi
 @endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin ; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stageprofile-libiberty-linker-plugin ; \
+         mv prev-libiberty-linker-plugin stage1-libiberty-linker-plugin ; :  ; \
+       fi
+@endif libiberty-linker-plugin
 @if zlib
        @if test -d $(HOST_SUBDIR)/zlib ; then \
          cd $(HOST_SUBDIR); mv zlib stageprofile-zlib ; \
@@ -42846,6 +47581,12 @@ stagefeedback-start::
        mv stagefeedback-binutils binutils  ; \
        mv stageprofile-binutils prev-binutils || test -f stageprofile-lean 
 @endif binutils
+@if fixincludes
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-fixincludes ] || \
+         mkdir stagefeedback-fixincludes; \
+       mv stagefeedback-fixincludes fixincludes  ; \
+       mv stageprofile-fixincludes prev-fixincludes || test -f stageprofile-lean 
+@endif fixincludes
 @if gas
        @cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \
          mkdir stagefeedback-gas; \
@@ -42912,6 +47653,12 @@ stagefeedback-start::
        mv stagefeedback-ld ld  ; \
        mv stageprofile-ld prev-ld || test -f stageprofile-lean 
 @endif ld
+@if libbacktrace
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-libbacktrace ] || \
+         mkdir stagefeedback-libbacktrace; \
+       mv stagefeedback-libbacktrace libbacktrace  ; \
+       mv stageprofile-libbacktrace prev-libbacktrace || test -f stageprofile-lean 
+@endif libbacktrace
 @if libcpp
        @cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \
          mkdir stagefeedback-libcpp; \
@@ -42930,6 +47677,12 @@ stagefeedback-start::
        mv stagefeedback-libiberty libiberty  ; \
        mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean 
 @endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty-linker-plugin ] || \
+         mkdir stagefeedback-libiberty-linker-plugin; \
+       mv stagefeedback-libiberty-linker-plugin libiberty-linker-plugin  ; \
+       mv stageprofile-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stageprofile-lean 
+@endif libiberty-linker-plugin
 @if zlib
        @cd $(HOST_SUBDIR); [ -d stagefeedback-zlib ] || \
          mkdir stagefeedback-zlib; \
@@ -42966,6 +47719,12 @@ stagefeedback-end::
          mv prev-binutils stageprofile-binutils ; :  ; \
        fi
 @endif binutils
+@if fixincludes
+       @if test -d $(HOST_SUBDIR)/fixincludes ; then \
+         cd $(HOST_SUBDIR); mv fixincludes stagefeedback-fixincludes ; \
+         mv prev-fixincludes stageprofile-fixincludes ; :  ; \
+       fi
+@endif fixincludes
 @if gas
        @if test -d $(HOST_SUBDIR)/gas ; then \
          cd $(HOST_SUBDIR); mv gas stagefeedback-gas ; \
@@ -43032,6 +47791,12 @@ stagefeedback-end::
          mv prev-ld stageprofile-ld ; :  ; \
        fi
 @endif ld
+@if libbacktrace
+       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stagefeedback-libbacktrace ; \
+         mv prev-libbacktrace stageprofile-libbacktrace ; :  ; \
+       fi
+@endif libbacktrace
 @if libcpp
        @if test -d $(HOST_SUBDIR)/libcpp ; then \
          cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp ; \
@@ -43050,6 +47815,12 @@ stagefeedback-end::
          mv prev-libiberty stageprofile-libiberty ; :  ; \
        fi
 @endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin ; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stagefeedback-libiberty-linker-plugin ; \
+         mv prev-libiberty-linker-plugin stageprofile-libiberty-linker-plugin ; :  ; \
+       fi
+@endif libiberty-linker-plugin
 @if zlib
        @if test -d $(HOST_SUBDIR)/zlib ; then \
          cd $(HOST_SUBDIR); mv zlib stagefeedback-zlib ; \
@@ -43175,7 +47946,19 @@ configure-stage3-target-libstdc++-v3: maybe-all-stage3-gcc
 configure-stage4-target-libstdc++-v3: maybe-all-stage4-gcc
 configure-stageprofile-target-libstdc++-v3: maybe-all-stageprofile-gcc
 configure-stagefeedback-target-libstdc++-v3: maybe-all-stagefeedback-gcc
-configure-target-libmudflap: stage_last
+configure-stage1-target-libsanitizer: maybe-all-stage1-gcc
+configure-stage2-target-libsanitizer: maybe-all-stage2-gcc
+configure-stage3-target-libsanitizer: maybe-all-stage3-gcc
+configure-stage4-target-libsanitizer: maybe-all-stage4-gcc
+configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-gcc
+configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-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
+configure-stage4-target-libvtv: maybe-all-stage4-gcc
+configure-stageprofile-target-libvtv: maybe-all-stageprofile-gcc
+configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-gcc
+configure-target-libcilkrts: stage_last
 configure-target-libssp: stage_last
 configure-target-newlib: stage_last
 configure-stage1-target-libgcc: maybe-all-stage1-gcc
@@ -43184,6 +47967,7 @@ configure-stage3-target-libgcc: maybe-all-stage3-gcc
 configure-stage4-target-libgcc: maybe-all-stage4-gcc
 configure-stageprofile-target-libgcc: maybe-all-stageprofile-gcc
 configure-stagefeedback-target-libgcc: maybe-all-stagefeedback-gcc
+configure-target-libbacktrace: stage_last
 configure-target-libquadmath: stage_last
 configure-target-libgfortran: stage_last
 configure-target-libobjc: stage_last
@@ -43209,10 +47993,13 @@ configure-target-libatomic: stage_last
 
 @if gcc-no-bootstrap
 configure-target-libstdc++-v3: maybe-all-gcc
-configure-target-libmudflap: maybe-all-gcc
+configure-target-libsanitizer: maybe-all-gcc
+configure-target-libvtv: maybe-all-gcc
+configure-target-libcilkrts: maybe-all-gcc
 configure-target-libssp: maybe-all-gcc
 configure-target-newlib: maybe-all-gcc
 configure-target-libgcc: maybe-all-gcc
+configure-target-libbacktrace: maybe-all-gcc
 configure-target-libquadmath: maybe-all-gcc
 configure-target-libgfortran: maybe-all-gcc
 configure-target-libobjc: maybe-all-gcc
@@ -43264,6 +48051,14 @@ configure-stage3-gcc: maybe-configure-stage3-intl
 configure-stage4-gcc: maybe-configure-stage4-intl
 configure-stageprofile-gcc: maybe-configure-stageprofile-intl
 configure-stagefeedback-gcc: maybe-configure-stagefeedback-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
+configure-stage4-gcc: maybe-all-stage4-gmp
+configure-stageprofile-gcc: maybe-all-stageprofile-gmp
+configure-stagefeedback-gcc: maybe-all-stagefeedback-gmp
 configure-gcc: maybe-all-lto-plugin
 
 configure-stage1-gcc: maybe-all-stage1-lto-plugin
@@ -43320,14 +48115,6 @@ all-stage3-gcc: all-stage3-libiberty
 all-stage4-gcc: all-stage4-libiberty
 all-stageprofile-gcc: all-stageprofile-libiberty
 all-stagefeedback-gcc: all-stagefeedback-libiberty
-all-gcc: maybe-all-gmp
-
-all-stage1-gcc: maybe-all-stage1-gmp
-all-stage2-gcc: maybe-all-stage2-gmp
-all-stage3-gcc: maybe-all-stage3-gmp
-all-stage4-gcc: maybe-all-stage4-gmp
-all-stageprofile-gcc: maybe-all-stageprofile-gmp
-all-stagefeedback-gcc: maybe-all-stagefeedback-gmp
 all-gcc: maybe-all-intl
 
 all-stage1-gcc: maybe-all-stage1-intl
@@ -43408,6 +48195,14 @@ all-stage3-gcc: maybe-all-stage3-zlib
 all-stage4-gcc: maybe-all-stage4-zlib
 all-stageprofile-gcc: maybe-all-stageprofile-zlib
 all-stagefeedback-gcc: maybe-all-stagefeedback-zlib
+all-gcc: all-libbacktrace
+
+all-stage1-gcc: all-stage1-libbacktrace
+all-stage2-gcc: all-stage2-libbacktrace
+all-stage3-gcc: all-stage3-libbacktrace
+all-stage4-gcc: all-stage4-libbacktrace
+all-stageprofile-gcc: all-stageprofile-libbacktrace
+all-stagefeedback-gcc: all-stagefeedback-libbacktrace
 all-gcc: all-libcpp
 
 all-stage1-gcc: all-stage1-libcpp
@@ -43433,6 +48228,13 @@ all-stage4-gcc: maybe-all-stage4-libiberty
 all-stageprofile-gcc: maybe-all-stageprofile-libiberty
 all-stagefeedback-gcc: maybe-all-stagefeedback-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
+all-stage4-gcc: maybe-all-stage4-fixincludes
+all-stageprofile-gcc: maybe-all-stageprofile-fixincludes
+all-stagefeedback-gcc: maybe-all-stagefeedback-fixincludes
 all-gcc: maybe-all-lto-plugin
 
 all-stage1-gcc: maybe-all-stage1-lto-plugin
@@ -43510,7 +48312,15 @@ all-stage4-libcpp: maybe-all-stage4-intl
 all-stageprofile-libcpp: maybe-all-stageprofile-intl
 all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
 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
+all-stage4-fixincludes: maybe-all-stage4-libiberty
+all-stageprofile-fixincludes: maybe-all-stageprofile-libiberty
+all-stagefeedback-fixincludes: maybe-all-stagefeedback-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
@@ -43519,6 +48329,14 @@ all-stage3-lto-plugin: maybe-all-stage3-libiberty
 all-stage4-lto-plugin: maybe-all-stage4-libiberty
 all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty
 all-stagefeedback-lto-plugin: maybe-all-stagefeedback-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
+all-stage4-lto-plugin: maybe-all-stage4-libiberty-linker-plugin
+all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty-linker-plugin
+all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty-linker-plugin
 all-utils: maybe-all-libiberty
 configure-mpfr: maybe-all-gmp
 
@@ -43681,6 +48499,14 @@ all-stage3-binutils: maybe-all-stage3-intl
 all-stage4-binutils: maybe-all-stage4-intl
 all-stageprofile-binutils: maybe-all-stageprofile-intl
 all-stagefeedback-binutils: maybe-all-stagefeedback-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
+all-stage4-binutils: maybe-all-stage4-gas
+all-stageprofile-binutils: maybe-all-stageprofile-gas
+all-stagefeedback-binutils: maybe-all-stagefeedback-gas
 install-binutils: maybe-install-opcodes
 install-strip-binutils: maybe-install-strip-opcodes
 install-opcodes: maybe-install-bfd
@@ -43730,6 +48556,7 @@ 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
@@ -43786,6 +48613,22 @@ all-stage3-ld: maybe-all-stage3-intl
 all-stage4-ld: maybe-all-stage4-intl
 all-stageprofile-ld: maybe-all-stageprofile-intl
 all-stagefeedback-ld: maybe-all-stagefeedback-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
+all-stage4-ld: maybe-all-stage4-gas
+all-stageprofile-ld: maybe-all-stageprofile-gas
+all-stagefeedback-ld: maybe-all-stagefeedback-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
+all-stage4-ld: maybe-all-stage4-binutils
+all-stageprofile-ld: maybe-all-stageprofile-binutils
+all-stagefeedback-ld: maybe-all-stagefeedback-binutils
 install-ld: maybe-install-gold
 install-strip-ld: maybe-install-strip-gold
 configure-gold: maybe-configure-intl
@@ -43828,6 +48671,14 @@ all-stage3-gold: maybe-all-build-bison
 all-stage4-gold: maybe-all-build-bison
 all-stageprofile-gold: maybe-all-build-bison
 all-stagefeedback-gold: maybe-all-build-bison
+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
+all-stage4-gold: maybe-all-stage4-gas
+all-stageprofile-gold: maybe-all-stageprofile-gas
+all-stagefeedback-gold: maybe-all-stagefeedback-gas
 check-gold: maybe-all-binutils
 
 check-stage1-gold: maybe-all-stage1-binutils
@@ -43923,7 +48774,9 @@ 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-libjava: maybe-configure-target-zlib
 configure-target-libjava: maybe-configure-target-boehm-gc
 configure-target-libjava: maybe-configure-target-libffi
@@ -43941,6 +48794,22 @@ configure-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp
 configure-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp
 configure-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp
 configure-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-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
+configure-stage4-target-libsanitizer: maybe-all-stage4-target-libstdc++-v3
+configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-target-libstdc++-v3
+configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-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
+configure-stage4-target-libvtv: maybe-all-stage4-target-libstdc++-v3
+configure-stageprofile-target-libvtv: maybe-all-stageprofile-target-libstdc++-v3
+configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libstdc++-v3
 all-target-libstdc++-v3: maybe-configure-target-libgomp
 
 all-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
@@ -43949,6 +48818,19 @@ all-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp
 all-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp
 all-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp
 all-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-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-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-libjava: maybe-install-target-libgcc
+install-target-libitm: maybe-install-target-libgcc
+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
@@ -43968,6 +48850,18 @@ configure-stage3-target-libstdc++-v3: maybe-all-stage3-target-libgcc
 configure-stage4-target-libstdc++-v3: maybe-all-stage4-target-libgcc
 configure-stageprofile-target-libstdc++-v3: maybe-all-stageprofile-target-libgcc
 configure-stagefeedback-target-libstdc++-v3: maybe-all-stagefeedback-target-libgcc
+configure-stage1-target-libsanitizer: maybe-all-stage1-target-libgcc
+configure-stage2-target-libsanitizer: maybe-all-stage2-target-libgcc
+configure-stage3-target-libsanitizer: maybe-all-stage3-target-libgcc
+configure-stage4-target-libsanitizer: maybe-all-stage4-target-libgcc
+configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-target-libgcc
+configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-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
+configure-stage4-target-libvtv: maybe-all-stage4-target-libgcc
+configure-stageprofile-target-libvtv: maybe-all-stageprofile-target-libgcc
+configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libgcc
 configure-stage1-target-libgomp: maybe-all-stage1-target-libgcc
 configure-stage2-target-libgomp: maybe-all-stage2-target-libgcc
 configure-stage3-target-libgomp: maybe-all-stage3-target-libgcc
@@ -43978,9 +48872,12 @@ configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-target-libgcc
 
 @if gcc-no-bootstrap
 configure-target-libstdc++-v3: maybe-all-target-libgcc
-configure-target-libmudflap: maybe-all-target-libgcc
+configure-target-libsanitizer: maybe-all-target-libgcc
+configure-target-libvtv: maybe-all-target-libgcc
+configure-target-libcilkrts: maybe-all-target-libgcc
 configure-target-libssp: maybe-all-target-libgcc
 configure-target-newlib: maybe-all-target-libgcc
+configure-target-libbacktrace: maybe-all-target-libgcc
 configure-target-libquadmath: maybe-all-target-libgcc
 configure-target-libgfortran: maybe-all-target-libgcc
 configure-target-libobjc: maybe-all-target-libgcc
@@ -44002,12 +48899,19 @@ configure-target-libatomic: maybe-all-target-libgcc
 
 configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss
 
-configure-target-libmudflap: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libsanitizer: 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-libssp: maybe-all-target-newlib maybe-all-target-libgloss
 
 
 
+configure-target-libbacktrace: maybe-all-target-newlib maybe-all-target-libgloss
+
 configure-target-libquadmath: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-libgfortran: maybe-all-target-newlib maybe-all-target-libgloss