Regenerate .pot files.
[gcc.git] / Makefile.in
index add8cf6b379f2add77ba9aae2b7720ac98f8b952..24f51a413c1cf94f262ff895ee390af5535c98e7 100644 (file)
@@ -213,6 +213,7 @@ HOST_EXPORTS = \
        LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \
        NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
        OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
+       OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY_FOR_TARGET; \
        RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
        READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
        TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
@@ -221,10 +222,8 @@ HOST_EXPORTS = \
        GMPINC="$(HOST_GMPINC)"; export GMPINC; \
        ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
        ISLINC="$(HOST_ISLINC)"; export ISLINC; \
-       CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \
-       CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \
-       LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \
-       LIBELFINC="$(HOST_LIBELFINC)" ; export LIBELFINC; \
+       LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
+       LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
 @if gcc-bootstrap
        $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
 @endif gcc-bootstrap
@@ -257,6 +256,7 @@ POSTSTAGE1_HOST_EXPORTS = \
          $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
        CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \
        $(POSTSTAGE1_CXX_EXPORT) \
+       $(LTO_EXPORTS) \
        GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
        LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \
        HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS;
@@ -286,6 +286,7 @@ BASE_TARGET_EXPORTS = \
        LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
        NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
        OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
+       OBJCOPY="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY; \
        RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
        READELF="$(READELF_FOR_TARGET)"; export READELF; \
        STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
@@ -314,10 +315,6 @@ HOST_GMPINC = @gmpinc@
 HOST_ISLLIBS = @isllibs@
 HOST_ISLINC = @islinc@
 
-# Where to find CLOOG
-HOST_CLOOGLIBS = @clooglibs@
-HOST_CLOOGINC = @clooginc@
-
 # Where to find libelf
 HOST_LIBELFLIBS = @libelflibs@
 HOST_LIBELFINC = @libelfinc@
@@ -485,11 +482,9 @@ STAGEfeedback_TFLAGS = $(STAGE_TFLAGS)
 STAGEfeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 
-# Only build the C compiler for stage1, because that is the only one that
-# we can guarantee will build with the native compiler, and also it is the
-# only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS),
-# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
-# overrideable (for a bootstrap build stage1 also builds gcc.info).
+# By default, C and C++ are the only stage1 languages, because they are the
+# only ones we require to build with the bootstrap compiler, and also the
+# only ones useful for building stage2.
 
 STAGE1_CFLAGS = @stage1_cflags@
 STAGE1_CHECKING = @stage1_checking@
@@ -538,6 +533,7 @@ LD_FOR_TARGET=@LD_FOR_TARGET@
 LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
 NM_FOR_TARGET=@NM_FOR_TARGET@
 OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
+OBJCOPY_FOR_TARGET=@OBJCOPY_FOR_TARGET@
 RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
 READELF_FOR_TARGET=@READELF_FOR_TARGET@
 STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
@@ -579,7 +575,7 @@ all:
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that programs built for the target machine work.
-TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_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)
+TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libmpx)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_libcilkrts)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
 
 @if target-libstdc++-v3
 TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
@@ -589,6 +585,10 @@ TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
 TARGET_LIB_PATH_libsanitizer = $$r/$(TARGET_SUBDIR)/libsanitizer/.libs:
 @endif target-libsanitizer
 
+@if target-libmpx
+TARGET_LIB_PATH_libmpx = $$r/$(TARGET_SUBDIR)/libmpx/.libs:
+@endif target-libmpx
+
 @if target-libvtv
 TARGET_LIB_PATH_libvtv = $$r/$(TARGET_SUBDIR)/libvtv/.libs:
 @endif target-libvtv
@@ -597,6 +597,10 @@ TARGET_LIB_PATH_libvtv = $$r/$(TARGET_SUBDIR)/libvtv/.libs:
 TARGET_LIB_PATH_libcilkrts = $$r/$(TARGET_SUBDIR)/libcilkrts/.libs:
 @endif target-libcilkrts
 
+@if target-liboffloadmic
+TARGET_LIB_PATH_liboffloadmic = $$r/$(TARGET_SUBDIR)/liboffloadmic/.libs:
+@endif target-liboffloadmic
+
 @if target-libssp
 TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
 @endif target-libssp
@@ -617,7 +621,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_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_libelf)
 
 # Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch
 @if gcc
@@ -645,11 +649,6 @@ HOST_LIB_PATH_isl = \
   $$r/$(HOST_SUBDIR)/isl/.libs:$$r/$(HOST_SUBDIR)/prev-isl/.libs:
 @endif isl
 
-@if cloog
-HOST_LIB_PATH_cloog = \
-  $$r/$(HOST_SUBDIR)/cloog/.libs:$$r/$(HOST_SUBDIR)/prev-cloog/.libs:
-@endif cloog
-
 @if libelf
 HOST_LIB_PATH_libelf = \
   $$r/$(HOST_SUBDIR)/libelf/.libs:$$r/$(HOST_SUBDIR)/prev-libelf/.libs:
@@ -676,7 +675,9 @@ CXX_FOR_TARGET_FLAG_TO_PASS = \
        $(shell if echo "$(CXX_FOR_TARGET)" | grep " -funconfigured-" > /dev/null; then :; else echo '"CXX_FOR_TARGET=$(CXX_FOR_TARGET)"'; fi)
 @endif target-libstdc++-v3
 
-# Flags to pass down to all sub-makes.
+# Flags to pass down to all sub-makes. STAGE*FLAGS,
+# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
+# overrideable (for a bootstrap build stage1 also builds gcc.info).
 BASE_FLAGS_TO_PASS = \
        "DESTDIR=$(DESTDIR)" \
        "RPATH_ENVVAR=$(RPATH_ENVVAR)" \
@@ -757,6 +758,7 @@ BASE_FLAGS_TO_PASS = \
        "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
        "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
        "OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET)" \
+       "OBJCOPY_FOR_TARGET=$(OBJCOPY_FOR_TARGET)" \
        "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
        "READELF_FOR_TARGET=$(READELF_FOR_TARGET)" \
        "STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \
@@ -828,8 +830,17 @@ POSTSTAGE1_FLAGS_TO_PASS = \
        GNATBIND="$${GNATBIND}" \
        LDFLAGS="$${LDFLAGS}" \
        HOST_LIBS="$${HOST_LIBS}" \
+       $(LTO_FLAGS_TO_PASS) \
        "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
 
+@if gcc-bootstrap
+EXTRA_HOST_EXPORTS = if [ $(current_stage) != stage1 ]; then \
+                      $(POSTSTAGE1_HOST_EXPORTS) \
+                    fi;
+
+EXTRA_BOOTSTRAP_FLAGS = CC="$$CC" CXX="$$CXX" LDFLAGS="$$LDFLAGS"
+@endif gcc-bootstrap
+
 # Flags to pass down to makes which are built with the target environment.
 # The double $ decreases the length of the command line; those variables
 # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
@@ -840,7 +851,9 @@ EXTRA_TARGET_FLAGS = \
        'AS=$(COMPILER_AS_FOR_TARGET)' \
        'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
        'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-       'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+       'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
+        -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
+        $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
        'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
        'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
        'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
@@ -853,11 +866,14 @@ EXTRA_TARGET_FLAGS = \
        'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
        'NM=$(COMPILER_NM_FOR_TARGET)' \
        'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
+       'OBJCOPY=$$(OBJCOPY_FOR_TARGET)' \
        'RANLIB=$$(RANLIB_FOR_TARGET)' \
        'READELF=$$(READELF_FOR_TARGET)' \
        'WINDRES=$$(WINDRES_FOR_TARGET)' \
        'WINDMC=$$(WINDMC_FOR_TARGET)' \
        'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
+       'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
+       'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
        "TFLAGS=$$TFLAGS"
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
@@ -900,7 +916,6 @@ configure-host:  \
     maybe-configure-mpfr \
     maybe-configure-mpc \
     maybe-configure-isl \
-    maybe-configure-cloog \
     maybe-configure-libelf \
     maybe-configure-gold \
     maybe-configure-gprof \
@@ -928,13 +943,17 @@ configure-host:  \
     maybe-configure-libtermcap \
     maybe-configure-utils \
     maybe-configure-gnattools \
-    maybe-configure-lto-plugin
+    maybe-configure-lto-plugin \
+    maybe-configure-libcc1 \
+    maybe-configure-gotools
 .PHONY: configure-target
 configure-target:  \
     maybe-configure-target-libstdc++-v3 \
     maybe-configure-target-libsanitizer \
+    maybe-configure-target-libmpx \
     maybe-configure-target-libvtv \
     maybe-configure-target-libcilkrts \
+    maybe-configure-target-liboffloadmic \
     maybe-configure-target-libssp \
     maybe-configure-target-newlib \
     maybe-configure-target-libgcc \
@@ -989,6 +1008,7 @@ all-build: maybe-all-build-flex
 all-build: maybe-all-build-m4
 all-build: maybe-all-build-texinfo
 all-build: maybe-all-build-fixincludes
+all-build: maybe-all-build-libcpp
 
 .PHONY: all-host
 
@@ -1028,9 +1048,6 @@ all-host: maybe-all-mpc
 @if isl-no-bootstrap
 all-host: maybe-all-isl
 @endif isl-no-bootstrap
-@if cloog-no-bootstrap
-all-host: maybe-all-cloog
-@endif cloog-no-bootstrap
 @if libelf-no-bootstrap
 all-host: maybe-all-libelf
 @endif libelf-no-bootstrap
@@ -1081,6 +1098,8 @@ all-host: maybe-all-gnattools
 @if lto-plugin-no-bootstrap
 all-host: maybe-all-lto-plugin
 @endif lto-plugin-no-bootstrap
+all-host: maybe-all-libcc1
+all-host: maybe-all-gotools
 
 .PHONY: all-target
 
@@ -1090,10 +1109,14 @@ all-target: maybe-all-target-libstdc++-v3
 @if target-libsanitizer-no-bootstrap
 all-target: maybe-all-target-libsanitizer
 @endif target-libsanitizer-no-bootstrap
+@if target-libmpx-no-bootstrap
+all-target: maybe-all-target-libmpx
+@endif target-libmpx-no-bootstrap
 @if target-libvtv-no-bootstrap
 all-target: maybe-all-target-libvtv
 @endif target-libvtv-no-bootstrap
 all-target: maybe-all-target-libcilkrts
+all-target: maybe-all-target-liboffloadmic
 all-target: maybe-all-target-libssp
 all-target: maybe-all-target-newlib
 @if target-libgcc-no-bootstrap
@@ -1151,7 +1174,6 @@ info-host: maybe-info-gmp
 info-host: maybe-info-mpfr
 info-host: maybe-info-mpc
 info-host: maybe-info-isl
-info-host: maybe-info-cloog
 info-host: maybe-info-libelf
 info-host: maybe-info-gold
 info-host: maybe-info-gprof
@@ -1180,13 +1202,17 @@ info-host: maybe-info-libtermcap
 info-host: maybe-info-utils
 info-host: maybe-info-gnattools
 info-host: maybe-info-lto-plugin
+info-host: maybe-info-libcc1
+info-host: maybe-info-gotools
 
 .PHONY: info-target
 
 info-target: maybe-info-target-libstdc++-v3
 info-target: maybe-info-target-libsanitizer
+info-target: maybe-info-target-libmpx
 info-target: maybe-info-target-libvtv
 info-target: maybe-info-target-libcilkrts
+info-target: maybe-info-target-liboffloadmic
 info-target: maybe-info-target-libssp
 info-target: maybe-info-target-newlib
 info-target: maybe-info-target-libgcc
@@ -1235,7 +1261,6 @@ dvi-host: maybe-dvi-gmp
 dvi-host: maybe-dvi-mpfr
 dvi-host: maybe-dvi-mpc
 dvi-host: maybe-dvi-isl
-dvi-host: maybe-dvi-cloog
 dvi-host: maybe-dvi-libelf
 dvi-host: maybe-dvi-gold
 dvi-host: maybe-dvi-gprof
@@ -1264,13 +1289,17 @@ dvi-host: maybe-dvi-libtermcap
 dvi-host: maybe-dvi-utils
 dvi-host: maybe-dvi-gnattools
 dvi-host: maybe-dvi-lto-plugin
+dvi-host: maybe-dvi-libcc1
+dvi-host: maybe-dvi-gotools
 
 .PHONY: dvi-target
 
 dvi-target: maybe-dvi-target-libstdc++-v3
 dvi-target: maybe-dvi-target-libsanitizer
+dvi-target: maybe-dvi-target-libmpx
 dvi-target: maybe-dvi-target-libvtv
 dvi-target: maybe-dvi-target-libcilkrts
+dvi-target: maybe-dvi-target-liboffloadmic
 dvi-target: maybe-dvi-target-libssp
 dvi-target: maybe-dvi-target-newlib
 dvi-target: maybe-dvi-target-libgcc
@@ -1319,7 +1348,6 @@ pdf-host: maybe-pdf-gmp
 pdf-host: maybe-pdf-mpfr
 pdf-host: maybe-pdf-mpc
 pdf-host: maybe-pdf-isl
-pdf-host: maybe-pdf-cloog
 pdf-host: maybe-pdf-libelf
 pdf-host: maybe-pdf-gold
 pdf-host: maybe-pdf-gprof
@@ -1348,13 +1376,17 @@ pdf-host: maybe-pdf-libtermcap
 pdf-host: maybe-pdf-utils
 pdf-host: maybe-pdf-gnattools
 pdf-host: maybe-pdf-lto-plugin
+pdf-host: maybe-pdf-libcc1
+pdf-host: maybe-pdf-gotools
 
 .PHONY: pdf-target
 
 pdf-target: maybe-pdf-target-libstdc++-v3
 pdf-target: maybe-pdf-target-libsanitizer
+pdf-target: maybe-pdf-target-libmpx
 pdf-target: maybe-pdf-target-libvtv
 pdf-target: maybe-pdf-target-libcilkrts
+pdf-target: maybe-pdf-target-liboffloadmic
 pdf-target: maybe-pdf-target-libssp
 pdf-target: maybe-pdf-target-newlib
 pdf-target: maybe-pdf-target-libgcc
@@ -1403,7 +1435,6 @@ html-host: maybe-html-gmp
 html-host: maybe-html-mpfr
 html-host: maybe-html-mpc
 html-host: maybe-html-isl
-html-host: maybe-html-cloog
 html-host: maybe-html-libelf
 html-host: maybe-html-gold
 html-host: maybe-html-gprof
@@ -1432,13 +1463,17 @@ html-host: maybe-html-libtermcap
 html-host: maybe-html-utils
 html-host: maybe-html-gnattools
 html-host: maybe-html-lto-plugin
+html-host: maybe-html-libcc1
+html-host: maybe-html-gotools
 
 .PHONY: html-target
 
 html-target: maybe-html-target-libstdc++-v3
 html-target: maybe-html-target-libsanitizer
+html-target: maybe-html-target-libmpx
 html-target: maybe-html-target-libvtv
 html-target: maybe-html-target-libcilkrts
+html-target: maybe-html-target-liboffloadmic
 html-target: maybe-html-target-libssp
 html-target: maybe-html-target-newlib
 html-target: maybe-html-target-libgcc
@@ -1487,7 +1522,6 @@ TAGS-host: maybe-TAGS-gmp
 TAGS-host: maybe-TAGS-mpfr
 TAGS-host: maybe-TAGS-mpc
 TAGS-host: maybe-TAGS-isl
-TAGS-host: maybe-TAGS-cloog
 TAGS-host: maybe-TAGS-libelf
 TAGS-host: maybe-TAGS-gold
 TAGS-host: maybe-TAGS-gprof
@@ -1516,13 +1550,17 @@ TAGS-host: maybe-TAGS-libtermcap
 TAGS-host: maybe-TAGS-utils
 TAGS-host: maybe-TAGS-gnattools
 TAGS-host: maybe-TAGS-lto-plugin
+TAGS-host: maybe-TAGS-libcc1
+TAGS-host: maybe-TAGS-gotools
 
 .PHONY: TAGS-target
 
 TAGS-target: maybe-TAGS-target-libstdc++-v3
 TAGS-target: maybe-TAGS-target-libsanitizer
+TAGS-target: maybe-TAGS-target-libmpx
 TAGS-target: maybe-TAGS-target-libvtv
 TAGS-target: maybe-TAGS-target-libcilkrts
+TAGS-target: maybe-TAGS-target-liboffloadmic
 TAGS-target: maybe-TAGS-target-libssp
 TAGS-target: maybe-TAGS-target-newlib
 TAGS-target: maybe-TAGS-target-libgcc
@@ -1571,7 +1609,6 @@ install-info-host: maybe-install-info-gmp
 install-info-host: maybe-install-info-mpfr
 install-info-host: maybe-install-info-mpc
 install-info-host: maybe-install-info-isl
-install-info-host: maybe-install-info-cloog
 install-info-host: maybe-install-info-libelf
 install-info-host: maybe-install-info-gold
 install-info-host: maybe-install-info-gprof
@@ -1600,13 +1637,17 @@ install-info-host: maybe-install-info-libtermcap
 install-info-host: maybe-install-info-utils
 install-info-host: maybe-install-info-gnattools
 install-info-host: maybe-install-info-lto-plugin
+install-info-host: maybe-install-info-libcc1
+install-info-host: maybe-install-info-gotools
 
 .PHONY: install-info-target
 
 install-info-target: maybe-install-info-target-libstdc++-v3
 install-info-target: maybe-install-info-target-libsanitizer
+install-info-target: maybe-install-info-target-libmpx
 install-info-target: maybe-install-info-target-libvtv
 install-info-target: maybe-install-info-target-libcilkrts
+install-info-target: maybe-install-info-target-liboffloadmic
 install-info-target: maybe-install-info-target-libssp
 install-info-target: maybe-install-info-target-newlib
 install-info-target: maybe-install-info-target-libgcc
@@ -1655,7 +1696,6 @@ install-pdf-host: maybe-install-pdf-gmp
 install-pdf-host: maybe-install-pdf-mpfr
 install-pdf-host: maybe-install-pdf-mpc
 install-pdf-host: maybe-install-pdf-isl
-install-pdf-host: maybe-install-pdf-cloog
 install-pdf-host: maybe-install-pdf-libelf
 install-pdf-host: maybe-install-pdf-gold
 install-pdf-host: maybe-install-pdf-gprof
@@ -1684,13 +1724,17 @@ install-pdf-host: maybe-install-pdf-libtermcap
 install-pdf-host: maybe-install-pdf-utils
 install-pdf-host: maybe-install-pdf-gnattools
 install-pdf-host: maybe-install-pdf-lto-plugin
+install-pdf-host: maybe-install-pdf-libcc1
+install-pdf-host: maybe-install-pdf-gotools
 
 .PHONY: install-pdf-target
 
 install-pdf-target: maybe-install-pdf-target-libstdc++-v3
 install-pdf-target: maybe-install-pdf-target-libsanitizer
+install-pdf-target: maybe-install-pdf-target-libmpx
 install-pdf-target: maybe-install-pdf-target-libvtv
 install-pdf-target: maybe-install-pdf-target-libcilkrts
+install-pdf-target: maybe-install-pdf-target-liboffloadmic
 install-pdf-target: maybe-install-pdf-target-libssp
 install-pdf-target: maybe-install-pdf-target-newlib
 install-pdf-target: maybe-install-pdf-target-libgcc
@@ -1739,7 +1783,6 @@ install-html-host: maybe-install-html-gmp
 install-html-host: maybe-install-html-mpfr
 install-html-host: maybe-install-html-mpc
 install-html-host: maybe-install-html-isl
-install-html-host: maybe-install-html-cloog
 install-html-host: maybe-install-html-libelf
 install-html-host: maybe-install-html-gold
 install-html-host: maybe-install-html-gprof
@@ -1768,13 +1811,17 @@ install-html-host: maybe-install-html-libtermcap
 install-html-host: maybe-install-html-utils
 install-html-host: maybe-install-html-gnattools
 install-html-host: maybe-install-html-lto-plugin
+install-html-host: maybe-install-html-libcc1
+install-html-host: maybe-install-html-gotools
 
 .PHONY: install-html-target
 
 install-html-target: maybe-install-html-target-libstdc++-v3
 install-html-target: maybe-install-html-target-libsanitizer
+install-html-target: maybe-install-html-target-libmpx
 install-html-target: maybe-install-html-target-libvtv
 install-html-target: maybe-install-html-target-libcilkrts
+install-html-target: maybe-install-html-target-liboffloadmic
 install-html-target: maybe-install-html-target-libssp
 install-html-target: maybe-install-html-target-newlib
 install-html-target: maybe-install-html-target-libgcc
@@ -1823,7 +1870,6 @@ installcheck-host: maybe-installcheck-gmp
 installcheck-host: maybe-installcheck-mpfr
 installcheck-host: maybe-installcheck-mpc
 installcheck-host: maybe-installcheck-isl
-installcheck-host: maybe-installcheck-cloog
 installcheck-host: maybe-installcheck-libelf
 installcheck-host: maybe-installcheck-gold
 installcheck-host: maybe-installcheck-gprof
@@ -1852,13 +1898,17 @@ installcheck-host: maybe-installcheck-libtermcap
 installcheck-host: maybe-installcheck-utils
 installcheck-host: maybe-installcheck-gnattools
 installcheck-host: maybe-installcheck-lto-plugin
+installcheck-host: maybe-installcheck-libcc1
+installcheck-host: maybe-installcheck-gotools
 
 .PHONY: installcheck-target
 
 installcheck-target: maybe-installcheck-target-libstdc++-v3
 installcheck-target: maybe-installcheck-target-libsanitizer
+installcheck-target: maybe-installcheck-target-libmpx
 installcheck-target: maybe-installcheck-target-libvtv
 installcheck-target: maybe-installcheck-target-libcilkrts
+installcheck-target: maybe-installcheck-target-liboffloadmic
 installcheck-target: maybe-installcheck-target-libssp
 installcheck-target: maybe-installcheck-target-newlib
 installcheck-target: maybe-installcheck-target-libgcc
@@ -1907,7 +1957,6 @@ mostlyclean-host: maybe-mostlyclean-gmp
 mostlyclean-host: maybe-mostlyclean-mpfr
 mostlyclean-host: maybe-mostlyclean-mpc
 mostlyclean-host: maybe-mostlyclean-isl
-mostlyclean-host: maybe-mostlyclean-cloog
 mostlyclean-host: maybe-mostlyclean-libelf
 mostlyclean-host: maybe-mostlyclean-gold
 mostlyclean-host: maybe-mostlyclean-gprof
@@ -1936,13 +1985,17 @@ mostlyclean-host: maybe-mostlyclean-libtermcap
 mostlyclean-host: maybe-mostlyclean-utils
 mostlyclean-host: maybe-mostlyclean-gnattools
 mostlyclean-host: maybe-mostlyclean-lto-plugin
+mostlyclean-host: maybe-mostlyclean-libcc1
+mostlyclean-host: maybe-mostlyclean-gotools
 
 .PHONY: mostlyclean-target
 
 mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3
 mostlyclean-target: maybe-mostlyclean-target-libsanitizer
+mostlyclean-target: maybe-mostlyclean-target-libmpx
 mostlyclean-target: maybe-mostlyclean-target-libvtv
 mostlyclean-target: maybe-mostlyclean-target-libcilkrts
+mostlyclean-target: maybe-mostlyclean-target-liboffloadmic
 mostlyclean-target: maybe-mostlyclean-target-libssp
 mostlyclean-target: maybe-mostlyclean-target-newlib
 mostlyclean-target: maybe-mostlyclean-target-libgcc
@@ -1991,7 +2044,6 @@ clean-host: maybe-clean-gmp
 clean-host: maybe-clean-mpfr
 clean-host: maybe-clean-mpc
 clean-host: maybe-clean-isl
-clean-host: maybe-clean-cloog
 clean-host: maybe-clean-libelf
 clean-host: maybe-clean-gold
 clean-host: maybe-clean-gprof
@@ -2020,13 +2072,17 @@ clean-host: maybe-clean-libtermcap
 clean-host: maybe-clean-utils
 clean-host: maybe-clean-gnattools
 clean-host: maybe-clean-lto-plugin
+clean-host: maybe-clean-libcc1
+clean-host: maybe-clean-gotools
 
 .PHONY: clean-target
 
 clean-target: maybe-clean-target-libstdc++-v3
 clean-target: maybe-clean-target-libsanitizer
+clean-target: maybe-clean-target-libmpx
 clean-target: maybe-clean-target-libvtv
 clean-target: maybe-clean-target-libcilkrts
+clean-target: maybe-clean-target-liboffloadmic
 clean-target: maybe-clean-target-libssp
 clean-target: maybe-clean-target-newlib
 clean-target: maybe-clean-target-libgcc
@@ -2075,7 +2131,6 @@ distclean-host: maybe-distclean-gmp
 distclean-host: maybe-distclean-mpfr
 distclean-host: maybe-distclean-mpc
 distclean-host: maybe-distclean-isl
-distclean-host: maybe-distclean-cloog
 distclean-host: maybe-distclean-libelf
 distclean-host: maybe-distclean-gold
 distclean-host: maybe-distclean-gprof
@@ -2104,13 +2159,17 @@ distclean-host: maybe-distclean-libtermcap
 distclean-host: maybe-distclean-utils
 distclean-host: maybe-distclean-gnattools
 distclean-host: maybe-distclean-lto-plugin
+distclean-host: maybe-distclean-libcc1
+distclean-host: maybe-distclean-gotools
 
 .PHONY: distclean-target
 
 distclean-target: maybe-distclean-target-libstdc++-v3
 distclean-target: maybe-distclean-target-libsanitizer
+distclean-target: maybe-distclean-target-libmpx
 distclean-target: maybe-distclean-target-libvtv
 distclean-target: maybe-distclean-target-libcilkrts
+distclean-target: maybe-distclean-target-liboffloadmic
 distclean-target: maybe-distclean-target-libssp
 distclean-target: maybe-distclean-target-newlib
 distclean-target: maybe-distclean-target-libgcc
@@ -2159,7 +2218,6 @@ maintainer-clean-host: maybe-maintainer-clean-gmp
 maintainer-clean-host: maybe-maintainer-clean-mpfr
 maintainer-clean-host: maybe-maintainer-clean-mpc
 maintainer-clean-host: maybe-maintainer-clean-isl
-maintainer-clean-host: maybe-maintainer-clean-cloog
 maintainer-clean-host: maybe-maintainer-clean-libelf
 maintainer-clean-host: maybe-maintainer-clean-gold
 maintainer-clean-host: maybe-maintainer-clean-gprof
@@ -2188,13 +2246,17 @@ maintainer-clean-host: maybe-maintainer-clean-libtermcap
 maintainer-clean-host: maybe-maintainer-clean-utils
 maintainer-clean-host: maybe-maintainer-clean-gnattools
 maintainer-clean-host: maybe-maintainer-clean-lto-plugin
+maintainer-clean-host: maybe-maintainer-clean-libcc1
+maintainer-clean-host: maybe-maintainer-clean-gotools
 
 .PHONY: maintainer-clean-target
 
 maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3
 maintainer-clean-target: maybe-maintainer-clean-target-libsanitizer
+maintainer-clean-target: maybe-maintainer-clean-target-libmpx
 maintainer-clean-target: maybe-maintainer-clean-target-libvtv
 maintainer-clean-target: maybe-maintainer-clean-target-libcilkrts
+maintainer-clean-target: maybe-maintainer-clean-target-liboffloadmic
 maintainer-clean-target: maybe-maintainer-clean-target-libssp
 maintainer-clean-target: maybe-maintainer-clean-target-newlib
 maintainer-clean-target: maybe-maintainer-clean-target-libgcc
@@ -2235,9 +2297,9 @@ do-info: maybe-all-texinfo
 
 install-info: do-install-info dir.info
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if [ -f dir.info ] ; then \
-         $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
-       else true ; fi
+       if [ -f dir.info ]; then \
+         $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info; \
+       else true; fi
 
 install-pdf: do-install-pdf
 
@@ -2298,7 +2360,6 @@ check-host:  \
     maybe-check-mpfr \
     maybe-check-mpc \
     maybe-check-isl \
-    maybe-check-cloog \
     maybe-check-libelf \
     maybe-check-gold \
     maybe-check-gprof \
@@ -2326,14 +2387,18 @@ check-host:  \
     maybe-check-libtermcap \
     maybe-check-utils \
     maybe-check-gnattools \
-    maybe-check-lto-plugin
+    maybe-check-lto-plugin \
+    maybe-check-libcc1 \
+    maybe-check-gotools
 
 .PHONY: check-target
 check-target:  \
     maybe-check-target-libstdc++-v3 \
     maybe-check-target-libsanitizer \
+    maybe-check-target-libmpx \
     maybe-check-target-libvtv \
     maybe-check-target-libcilkrts \
+    maybe-check-target-liboffloadmic \
     maybe-check-target-libssp \
     maybe-check-target-newlib \
     maybe-check-target-libgcc \
@@ -2382,6 +2447,18 @@ mail-report-with-warnings.log: warning.log
        chmod +x $@
        echo If you really want to send e-mail, run ./$@ now
 
+# Local Vim config
+
+$(srcdir)/.local.vimrc:
+       $(LN_S) contrib/vimrc $@
+
+$(srcdir)/.lvimrc:
+       $(LN_S) contrib/vimrc $@
+
+vimrc: $(srcdir)/.local.vimrc $(srcdir)/.lvimrc
+
+.PHONY: vimrc
+
 # Installation targets.
 
 .PHONY: install uninstall
@@ -2408,7 +2485,6 @@ install-host-nogcc:  \
     maybe-install-mpfr \
     maybe-install-mpc \
     maybe-install-isl \
-    maybe-install-cloog \
     maybe-install-libelf \
     maybe-install-gold \
     maybe-install-gprof \
@@ -2436,7 +2512,9 @@ install-host-nogcc:  \
     maybe-install-libtermcap \
     maybe-install-utils \
     maybe-install-gnattools \
-    maybe-install-lto-plugin
+    maybe-install-lto-plugin \
+    maybe-install-libcc1 \
+    maybe-install-gotools
 
 .PHONY: install-host
 install-host:  \
@@ -2456,7 +2534,6 @@ install-host:  \
     maybe-install-mpfr \
     maybe-install-mpc \
     maybe-install-isl \
-    maybe-install-cloog \
     maybe-install-libelf \
     maybe-install-gold \
     maybe-install-gprof \
@@ -2484,14 +2561,18 @@ install-host:  \
     maybe-install-libtermcap \
     maybe-install-utils \
     maybe-install-gnattools \
-    maybe-install-lto-plugin
+    maybe-install-lto-plugin \
+    maybe-install-libcc1 \
+    maybe-install-gotools
 
 .PHONY: install-target
 install-target:  \
     maybe-install-target-libstdc++-v3 \
     maybe-install-target-libsanitizer \
+    maybe-install-target-libmpx \
     maybe-install-target-libvtv \
     maybe-install-target-libcilkrts \
+    maybe-install-target-liboffloadmic \
     maybe-install-target-libssp \
     maybe-install-target-newlib \
     maybe-install-target-libgcc \
@@ -2518,14 +2599,14 @@ uninstall:
 
 .PHONY: install.all
 install.all: install-no-fixedincludes
-       @if [ -f ./gcc/Makefile ] ; then \
-               r=`${PWD_COMMAND}` ; export r ; \
+       @if [ -f ./gcc/Makefile ]; then \
+               r=`${PWD_COMMAND}`; export r; \
                s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
                $(HOST_EXPORTS) \
                (cd ./gcc && \
-               $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
+               $(MAKE) $(FLAGS_TO_PASS) install-headers); \
        else \
-               true ; \
+               true; \
        fi
 
 # install-no-fixedincludes is used to allow the elaboration of binary packages
@@ -2560,7 +2641,6 @@ install-strip-host:  \
     maybe-install-strip-mpfr \
     maybe-install-strip-mpc \
     maybe-install-strip-isl \
-    maybe-install-strip-cloog \
     maybe-install-strip-libelf \
     maybe-install-strip-gold \
     maybe-install-strip-gprof \
@@ -2588,14 +2668,18 @@ install-strip-host:  \
     maybe-install-strip-libtermcap \
     maybe-install-strip-utils \
     maybe-install-strip-gnattools \
-    maybe-install-strip-lto-plugin
+    maybe-install-strip-lto-plugin \
+    maybe-install-strip-libcc1 \
+    maybe-install-strip-gotools
 
 .PHONY: install-strip-target
 install-strip-target:  \
     maybe-install-strip-target-libstdc++-v3 \
     maybe-install-strip-target-libsanitizer \
+    maybe-install-strip-target-libmpx \
     maybe-install-strip-target-libvtv \
     maybe-install-strip-target-libcilkrts \
+    maybe-install-strip-target-liboffloadmic \
     maybe-install-strip-target-libssp \
     maybe-install-strip-target-newlib \
     maybe-install-strip-target-libgcc \
@@ -2628,10 +2712,10 @@ installdirs: mkinstalldirs
        $(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
 
 dir.info: do-install-info
-       if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
-         $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
-         mv -f dir.info.new dir.info ; \
-       else true ; \
+       if [ -f $(srcdir)/texinfo/gen-info-dir ]; then \
+         $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new; \
+         mv -f dir.info.new dir.info; \
+       else true; \
        fi
 
 dist:
@@ -2673,7 +2757,7 @@ configure-build-libiberty:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty; \
        $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/libiberty; \
        cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \
@@ -2730,7 +2814,7 @@ configure-build-bison:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison; \
        $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/bison; \
        cd "$(BUILD_SUBDIR)/bison" || exit 1; \
@@ -2787,7 +2871,7 @@ configure-build-flex:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex; \
        $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/flex; \
        cd "$(BUILD_SUBDIR)/flex" || exit 1; \
@@ -2844,7 +2928,7 @@ configure-build-m4:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4; \
        $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/m4; \
        cd "$(BUILD_SUBDIR)/m4" || exit 1; \
@@ -2901,7 +2985,7 @@ configure-build-texinfo:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo; \
        $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/texinfo; \
        cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \
@@ -2958,7 +3042,7 @@ configure-build-fixincludes:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes; \
        $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/fixincludes; \
        cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \
@@ -3003,6 +3087,63 @@ all-build-fixincludes: configure-build-fixincludes
 
 
 
+.PHONY: configure-build-libcpp maybe-configure-build-libcpp
+maybe-configure-build-libcpp:
+@if gcc-bootstrap
+configure-build-libcpp: stage_current
+@endif gcc-bootstrap
+@if build-libcpp
+maybe-configure-build-libcpp: configure-build-libcpp
+configure-build-libcpp: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(BUILD_SUBDIR)/libcpp/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libcpp; \
+       $(BUILD_EXPORTS)  \
+       echo Configuring in $(BUILD_SUBDIR)/libcpp; \
+       cd "$(BUILD_SUBDIR)/libcpp" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(BUILD_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libcpp; \
+       rm -f no-such-file || : ; \
+       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} --disable-nls am_cv_func_iconv=no \
+         || exit 1
+@endif build-libcpp
+
+
+
+
+
+.PHONY: all-build-libcpp maybe-all-build-libcpp
+maybe-all-build-libcpp:
+@if gcc-bootstrap
+all-build-libcpp: stage_current
+@endif gcc-bootstrap
+@if build-libcpp
+TARGET-build-libcpp=all
+maybe-all-build-libcpp: all-build-libcpp
+all-build-libcpp: configure-build-libcpp
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS)  \
+       (cd $(BUILD_SUBDIR)/libcpp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
+               $(TARGET-build-libcpp))
+@endif build-libcpp
+
+
+
+
+
 # --------------------------------------
 # Modules which run on the host machine
 # --------------------------------------
@@ -3019,7 +3160,7 @@ configure-bfd:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/bfd; \
        cd "$(HOST_SUBDIR)/bfd" || exit 1; \
@@ -3054,8 +3195,8 @@ configure-stage1-bfd:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/bfd; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -3087,8 +3228,8 @@ configure-stage2-bfd:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/bfd; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -3100,7 +3241,7 @@ configure-stage2-bfd:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
@@ -3120,8 +3261,8 @@ configure-stage3-bfd:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/bfd; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -3133,7 +3274,7 @@ configure-stage3-bfd:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
@@ -3153,8 +3294,8 @@ configure-stage4-bfd:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/bfd; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -3166,7 +3307,7 @@ configure-stage4-bfd:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
@@ -3186,8 +3327,8 @@ configure-stageprofile-bfd:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/bfd; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -3199,7 +3340,7 @@ configure-stageprofile-bfd:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
@@ -3219,8 +3360,8 @@ configure-stagefeedback-bfd:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/bfd; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -3232,7 +3373,7 @@ configure-stagefeedback-bfd:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
@@ -3518,9 +3659,9 @@ check-bfd:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/bfd && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif bfd
 
@@ -3570,7 +3711,7 @@ info-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in bfd" ; \
+       echo "Doing info in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3595,7 +3736,7 @@ dvi-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in bfd" ; \
+       echo "Doing dvi in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3620,7 +3761,7 @@ pdf-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in bfd" ; \
+       echo "Doing pdf in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3645,7 +3786,7 @@ html-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in bfd" ; \
+       echo "Doing html in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3670,7 +3811,7 @@ TAGS-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in bfd" ; \
+       echo "Doing TAGS in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3696,7 +3837,7 @@ install-info-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in bfd" ; \
+       echo "Doing install-info in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3722,7 +3863,7 @@ install-pdf-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in bfd" ; \
+       echo "Doing install-pdf in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3748,7 +3889,7 @@ install-html-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in bfd" ; \
+       echo "Doing install-html in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3773,7 +3914,7 @@ installcheck-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in bfd" ; \
+       echo "Doing installcheck in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3797,7 +3938,7 @@ mostlyclean-bfd:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in bfd" ; \
+       echo "Doing mostlyclean in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3821,7 +3962,7 @@ clean-bfd:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in bfd" ; \
+       echo "Doing clean in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3845,7 +3986,7 @@ distclean-bfd:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in bfd" ; \
+       echo "Doing distclean in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3869,7 +4010,7 @@ maintainer-clean-bfd:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in bfd" ; \
+       echo "Doing maintainer-clean in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3893,7 +4034,7 @@ configure-opcodes:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/opcodes; \
        cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
@@ -3928,8 +4069,8 @@ configure-stage1-opcodes:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -3961,8 +4102,8 @@ configure-stage2-opcodes:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -3974,7 +4115,7 @@ configure-stage2-opcodes:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
@@ -3994,8 +4135,8 @@ configure-stage3-opcodes:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4007,7 +4148,7 @@ configure-stage3-opcodes:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
@@ -4027,8 +4168,8 @@ configure-stage4-opcodes:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4040,7 +4181,7 @@ configure-stage4-opcodes:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
@@ -4060,8 +4201,8 @@ configure-stageprofile-opcodes:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/opcodes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4073,7 +4214,7 @@ configure-stageprofile-opcodes:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
@@ -4093,8 +4234,8 @@ configure-stagefeedback-opcodes:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4106,7 +4247,7 @@ configure-stagefeedback-opcodes:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
@@ -4392,9 +4533,9 @@ check-opcodes:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/opcodes && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif opcodes
 
@@ -4444,7 +4585,7 @@ info-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in opcodes" ; \
+       echo "Doing info in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4469,7 +4610,7 @@ dvi-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in opcodes" ; \
+       echo "Doing dvi in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4494,7 +4635,7 @@ pdf-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in opcodes" ; \
+       echo "Doing pdf in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4519,7 +4660,7 @@ html-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in opcodes" ; \
+       echo "Doing html in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4544,7 +4685,7 @@ TAGS-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in opcodes" ; \
+       echo "Doing TAGS in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4570,7 +4711,7 @@ install-info-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in opcodes" ; \
+       echo "Doing install-info in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4596,7 +4737,7 @@ install-pdf-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in opcodes" ; \
+       echo "Doing install-pdf in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4622,7 +4763,7 @@ install-html-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in opcodes" ; \
+       echo "Doing install-html in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4647,7 +4788,7 @@ installcheck-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in opcodes" ; \
+       echo "Doing installcheck in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4671,7 +4812,7 @@ mostlyclean-opcodes:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in opcodes" ; \
+       echo "Doing mostlyclean in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4695,7 +4836,7 @@ clean-opcodes:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in opcodes" ; \
+       echo "Doing clean in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4719,7 +4860,7 @@ distclean-opcodes:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in opcodes" ; \
+       echo "Doing distclean in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4743,7 +4884,7 @@ maintainer-clean-opcodes:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in opcodes" ; \
+       echo "Doing maintainer-clean in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4767,7 +4908,7 @@ configure-binutils:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/binutils; \
        cd "$(HOST_SUBDIR)/binutils" || exit 1; \
@@ -4802,8 +4943,8 @@ configure-stage1-binutils:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/binutils; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4835,8 +4976,8 @@ configure-stage2-binutils:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/binutils; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4848,7 +4989,7 @@ configure-stage2-binutils:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
@@ -4868,8 +5009,8 @@ configure-stage3-binutils:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/binutils; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4881,7 +5022,7 @@ configure-stage3-binutils:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
@@ -4901,8 +5042,8 @@ configure-stage4-binutils:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/binutils; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4914,7 +5055,7 @@ configure-stage4-binutils:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
@@ -4934,8 +5075,8 @@ configure-stageprofile-binutils:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/binutils; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4947,7 +5088,7 @@ configure-stageprofile-binutils:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
@@ -4967,8 +5108,8 @@ configure-stagefeedback-binutils:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/binutils; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4980,7 +5121,7 @@ configure-stagefeedback-binutils:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
@@ -5266,9 +5407,9 @@ check-binutils:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/binutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif binutils
 
@@ -5318,7 +5459,7 @@ info-binutils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in binutils" ; \
+       echo "Doing info in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5343,7 +5484,7 @@ dvi-binutils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in binutils" ; \
+       echo "Doing dvi in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5368,7 +5509,7 @@ pdf-binutils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in binutils" ; \
+       echo "Doing pdf in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5393,7 +5534,7 @@ html-binutils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in binutils" ; \
+       echo "Doing html in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5418,7 +5559,7 @@ TAGS-binutils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in binutils" ; \
+       echo "Doing TAGS in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5444,7 +5585,7 @@ install-info-binutils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in binutils" ; \
+       echo "Doing install-info in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5470,7 +5611,7 @@ install-pdf-binutils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in binutils" ; \
+       echo "Doing install-pdf in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5496,7 +5637,7 @@ install-html-binutils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in binutils" ; \
+       echo "Doing install-html in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5521,7 +5662,7 @@ installcheck-binutils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in binutils" ; \
+       echo "Doing installcheck in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5545,7 +5686,7 @@ mostlyclean-binutils:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in binutils" ; \
+       echo "Doing mostlyclean in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5569,7 +5710,7 @@ clean-binutils:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in binutils" ; \
+       echo "Doing clean in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5593,7 +5734,7 @@ distclean-binutils:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in binutils" ; \
+       echo "Doing distclean in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5617,7 +5758,7 @@ maintainer-clean-binutils:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in binutils" ; \
+       echo "Doing maintainer-clean in binutils"; \
        (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5642,7 +5783,7 @@ configure-bison:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/bison; \
        cd "$(HOST_SUBDIR)/bison" || exit 1; \
@@ -5693,12 +5834,12 @@ maybe-check-bison: check-bison
 # This module is only tested in a native toolchain.
 check-bison:
        @: $(MAKE); $(unstage)
-       @if [ '$(host)' = '$(target)' ] ; then \
+       @if [ '$(host)' = '$(target)' ]; then \
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(HOST_EXPORTS) \
+         $(HOST_EXPORTS)  \
          (cd $(HOST_SUBDIR)/bison && \
-           $(MAKE) $(FLAGS_TO_PASS)  check); \
+           $(MAKE) $(FLAGS_TO_PASS)  check)
        fi
 
 @endif bison
@@ -5750,7 +5891,7 @@ info-bison: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in bison" ; \
+       echo "Doing info in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5776,7 +5917,7 @@ dvi-bison: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in bison" ; \
+       echo "Doing dvi in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5802,7 +5943,7 @@ pdf-bison: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in bison" ; \
+       echo "Doing pdf in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5828,7 +5969,7 @@ html-bison: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in bison" ; \
+       echo "Doing html in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5854,7 +5995,7 @@ TAGS-bison: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in bison" ; \
+       echo "Doing TAGS in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5881,7 +6022,7 @@ install-info-bison: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in bison" ; \
+       echo "Doing install-info in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5908,7 +6049,7 @@ install-pdf-bison: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in bison" ; \
+       echo "Doing install-pdf in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5935,7 +6076,7 @@ install-html-bison: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in bison" ; \
+       echo "Doing install-html in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5961,7 +6102,7 @@ installcheck-bison: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in bison" ; \
+       echo "Doing installcheck in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5986,7 +6127,7 @@ mostlyclean-bison:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in bison" ; \
+       echo "Doing mostlyclean in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6011,7 +6152,7 @@ clean-bison:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in bison" ; \
+       echo "Doing clean in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6036,7 +6177,7 @@ distclean-bison:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in bison" ; \
+       echo "Doing distclean in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6061,7 +6202,7 @@ maintainer-clean-bison:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in bison" ; \
+       echo "Doing maintainer-clean in bison"; \
        (cd $(HOST_SUBDIR)/bison && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6086,7 +6227,7 @@ configure-cgen:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/cgen/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cgen ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cgen; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/cgen; \
        cd "$(HOST_SUBDIR)/cgen" || exit 1; \
@@ -6138,7 +6279,7 @@ check-cgen:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -6191,7 +6332,7 @@ info-cgen: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in cgen" ; \
+       echo "Doing info in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6217,7 +6358,7 @@ dvi-cgen: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in cgen" ; \
+       echo "Doing dvi in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6243,7 +6384,7 @@ pdf-cgen: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in cgen" ; \
+       echo "Doing pdf in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6269,7 +6410,7 @@ html-cgen: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in cgen" ; \
+       echo "Doing html in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6295,7 +6436,7 @@ TAGS-cgen: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in cgen" ; \
+       echo "Doing TAGS in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6322,7 +6463,7 @@ install-info-cgen: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in cgen" ; \
+       echo "Doing install-info in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6349,7 +6490,7 @@ install-pdf-cgen: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in cgen" ; \
+       echo "Doing install-pdf in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6376,7 +6517,7 @@ install-html-cgen: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in cgen" ; \
+       echo "Doing install-html in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6402,7 +6543,7 @@ installcheck-cgen: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in cgen" ; \
+       echo "Doing installcheck in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6427,7 +6568,7 @@ mostlyclean-cgen:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in cgen" ; \
+       echo "Doing mostlyclean in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6452,7 +6593,7 @@ clean-cgen:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in cgen" ; \
+       echo "Doing clean in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6477,7 +6618,7 @@ distclean-cgen:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in cgen" ; \
+       echo "Doing distclean in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6502,7 +6643,7 @@ maintainer-clean-cgen:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in cgen" ; \
+       echo "Doing maintainer-clean in cgen"; \
        (cd $(HOST_SUBDIR)/cgen && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6527,7 +6668,7 @@ configure-dejagnu:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/dejagnu; \
        cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \
@@ -6579,7 +6720,7 @@ check-dejagnu:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -6632,7 +6773,7 @@ info-dejagnu: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in dejagnu" ; \
+       echo "Doing info in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6658,7 +6799,7 @@ dvi-dejagnu: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in dejagnu" ; \
+       echo "Doing dvi in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6684,7 +6825,7 @@ pdf-dejagnu: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in dejagnu" ; \
+       echo "Doing pdf in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6710,7 +6851,7 @@ html-dejagnu: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in dejagnu" ; \
+       echo "Doing html in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6736,7 +6877,7 @@ TAGS-dejagnu: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in dejagnu" ; \
+       echo "Doing TAGS in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6763,7 +6904,7 @@ install-info-dejagnu: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in dejagnu" ; \
+       echo "Doing install-info in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6790,7 +6931,7 @@ install-pdf-dejagnu: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in dejagnu" ; \
+       echo "Doing install-pdf in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6817,7 +6958,7 @@ install-html-dejagnu: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in dejagnu" ; \
+       echo "Doing install-html in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6843,7 +6984,7 @@ installcheck-dejagnu: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in dejagnu" ; \
+       echo "Doing installcheck in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6868,7 +7009,7 @@ mostlyclean-dejagnu:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in dejagnu" ; \
+       echo "Doing mostlyclean in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6893,7 +7034,7 @@ clean-dejagnu:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in dejagnu" ; \
+       echo "Doing clean in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6918,7 +7059,7 @@ distclean-dejagnu:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in dejagnu" ; \
+       echo "Doing distclean in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6943,7 +7084,7 @@ maintainer-clean-dejagnu:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in dejagnu" ; \
+       echo "Doing maintainer-clean in dejagnu"; \
        (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6968,7 +7109,7 @@ configure-etc:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/etc; \
        cd "$(HOST_SUBDIR)/etc" || exit 1; \
@@ -7020,7 +7161,7 @@ check-etc:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -7073,7 +7214,7 @@ info-etc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in etc" ; \
+       echo "Doing info in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7099,7 +7240,7 @@ dvi-etc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in etc" ; \
+       echo "Doing dvi in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7125,7 +7266,7 @@ pdf-etc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in etc" ; \
+       echo "Doing pdf in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7151,7 +7292,7 @@ html-etc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in etc" ; \
+       echo "Doing html in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7177,7 +7318,7 @@ TAGS-etc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in etc" ; \
+       echo "Doing TAGS in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7204,7 +7345,7 @@ install-info-etc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in etc" ; \
+       echo "Doing install-info in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7231,7 +7372,7 @@ install-pdf-etc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in etc" ; \
+       echo "Doing install-pdf in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7258,7 +7399,7 @@ install-html-etc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in etc" ; \
+       echo "Doing install-html in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7284,7 +7425,7 @@ installcheck-etc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in etc" ; \
+       echo "Doing installcheck in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7309,7 +7450,7 @@ mostlyclean-etc:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in etc" ; \
+       echo "Doing mostlyclean in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7334,7 +7475,7 @@ clean-etc:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in etc" ; \
+       echo "Doing clean in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7359,7 +7500,7 @@ distclean-etc:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in etc" ; \
+       echo "Doing distclean in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7384,7 +7525,7 @@ maintainer-clean-etc:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in etc" ; \
+       echo "Doing maintainer-clean in etc"; \
        (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7409,7 +7550,7 @@ configure-fastjar:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/fastjar; \
        cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
@@ -7460,12 +7601,12 @@ maybe-check-fastjar: check-fastjar
 # This module is only tested in a native toolchain.
 check-fastjar:
        @: $(MAKE); $(unstage)
-       @if [ '$(host)' = '$(target)' ] ; then \
+       @if [ '$(host)' = '$(target)' ]; then \
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(HOST_EXPORTS) \
+         $(HOST_EXPORTS)  \
          (cd $(HOST_SUBDIR)/fastjar && \
-           $(MAKE) $(FLAGS_TO_PASS)  check); \
+           $(MAKE) $(FLAGS_TO_PASS)  check)
        fi
 
 @endif fastjar
@@ -7517,7 +7658,7 @@ info-fastjar: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in fastjar" ; \
+       echo "Doing info in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7543,7 +7684,7 @@ dvi-fastjar: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in fastjar" ; \
+       echo "Doing dvi in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7569,7 +7710,7 @@ pdf-fastjar: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in fastjar" ; \
+       echo "Doing pdf in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7595,7 +7736,7 @@ html-fastjar: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in fastjar" ; \
+       echo "Doing html in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7621,7 +7762,7 @@ TAGS-fastjar: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in fastjar" ; \
+       echo "Doing TAGS in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7648,7 +7789,7 @@ install-info-fastjar: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in fastjar" ; \
+       echo "Doing install-info in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7675,7 +7816,7 @@ install-pdf-fastjar: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in fastjar" ; \
+       echo "Doing install-pdf in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7702,7 +7843,7 @@ install-html-fastjar: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in fastjar" ; \
+       echo "Doing install-html in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7728,7 +7869,7 @@ installcheck-fastjar: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in fastjar" ; \
+       echo "Doing installcheck in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7753,7 +7894,7 @@ mostlyclean-fastjar:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in fastjar" ; \
+       echo "Doing mostlyclean in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7778,7 +7919,7 @@ clean-fastjar:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in fastjar" ; \
+       echo "Doing clean in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7803,7 +7944,7 @@ distclean-fastjar:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in fastjar" ; \
+       echo "Doing distclean in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7828,7 +7969,7 @@ maintainer-clean-fastjar:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in fastjar" ; \
+       echo "Doing maintainer-clean in fastjar"; \
        (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7852,7 +7993,7 @@ configure-fixincludes:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/fixincludes; \
        cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \
@@ -7887,8 +8028,8 @@ configure-stage1-fixincludes:
        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 ; \
+       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) ;; \
@@ -7920,8 +8061,8 @@ configure-stage2-fixincludes:
        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 ; \
+       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) ;; \
@@ -7933,7 +8074,7 @@ configure-stage2-fixincludes:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif fixincludes-bootstrap
 
@@ -7953,8 +8094,8 @@ configure-stage3-fixincludes:
        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 ; \
+       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) ;; \
@@ -7966,7 +8107,7 @@ configure-stage3-fixincludes:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif fixincludes-bootstrap
 
@@ -7986,8 +8127,8 @@ configure-stage4-fixincludes:
        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 ; \
+       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) ;; \
@@ -7999,7 +8140,7 @@ configure-stage4-fixincludes:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif fixincludes-bootstrap
 
@@ -8019,8 +8160,8 @@ configure-stageprofile-fixincludes:
        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 ; \
+       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) ;; \
@@ -8032,7 +8173,7 @@ configure-stageprofile-fixincludes:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif fixincludes-bootstrap
 
@@ -8052,8 +8193,8 @@ configure-stagefeedback-fixincludes:
        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 ; \
+       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) ;; \
@@ -8065,7 +8206,7 @@ configure-stagefeedback-fixincludes:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif fixincludes-bootstrap
 
@@ -8351,9 +8492,9 @@ check-fixincludes:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif fixincludes
 
@@ -8403,7 +8544,7 @@ info-fixincludes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in fixincludes" ; \
+       echo "Doing info in fixincludes"; \
        (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8428,7 +8569,7 @@ dvi-fixincludes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in fixincludes" ; \
+       echo "Doing dvi in fixincludes"; \
        (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8453,7 +8594,7 @@ pdf-fixincludes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in fixincludes" ; \
+       echo "Doing pdf in fixincludes"; \
        (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8478,7 +8619,7 @@ html-fixincludes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in fixincludes" ; \
+       echo "Doing html in fixincludes"; \
        (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8514,7 +8655,7 @@ install-info-fixincludes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in fixincludes" ; \
+       echo "Doing install-info in fixincludes"; \
        (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8540,7 +8681,7 @@ install-pdf-fixincludes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in fixincludes" ; \
+       echo "Doing install-pdf in fixincludes"; \
        (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8566,7 +8707,7 @@ install-html-fixincludes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in fixincludes" ; \
+       echo "Doing install-html in fixincludes"; \
        (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8591,7 +8732,7 @@ installcheck-fixincludes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in fixincludes" ; \
+       echo "Doing installcheck in fixincludes"; \
        (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8615,7 +8756,7 @@ mostlyclean-fixincludes:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in fixincludes" ; \
+       echo "Doing mostlyclean in fixincludes"; \
        (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8639,7 +8780,7 @@ clean-fixincludes:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in fixincludes" ; \
+       echo "Doing clean in fixincludes"; \
        (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8663,7 +8804,7 @@ distclean-fixincludes:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in fixincludes" ; \
+       echo "Doing distclean in fixincludes"; \
        (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8687,7 +8828,7 @@ maintainer-clean-fixincludes:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in fixincludes" ; \
+       echo "Doing maintainer-clean in fixincludes"; \
        (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8712,7 +8853,7 @@ configure-flex:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/flex; \
        cd "$(HOST_SUBDIR)/flex" || exit 1; \
@@ -8763,12 +8904,12 @@ maybe-check-flex: check-flex
 # This module is only tested in a native toolchain.
 check-flex:
        @: $(MAKE); $(unstage)
-       @if [ '$(host)' = '$(target)' ] ; then \
+       @if [ '$(host)' = '$(target)' ]; then \
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(HOST_EXPORTS) \
+         $(HOST_EXPORTS)  \
          (cd $(HOST_SUBDIR)/flex && \
-           $(MAKE) $(FLAGS_TO_PASS)  check); \
+           $(MAKE) $(FLAGS_TO_PASS)  check)
        fi
 
 @endif flex
@@ -8820,7 +8961,7 @@ info-flex: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in flex" ; \
+       echo "Doing info in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8846,7 +8987,7 @@ dvi-flex: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in flex" ; \
+       echo "Doing dvi in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8872,7 +9013,7 @@ pdf-flex: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in flex" ; \
+       echo "Doing pdf in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8898,7 +9039,7 @@ html-flex: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in flex" ; \
+       echo "Doing html in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8924,7 +9065,7 @@ TAGS-flex: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in flex" ; \
+       echo "Doing TAGS in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8951,7 +9092,7 @@ install-info-flex: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in flex" ; \
+       echo "Doing install-info in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -8978,7 +9119,7 @@ install-pdf-flex: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in flex" ; \
+       echo "Doing install-pdf in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9005,7 +9146,7 @@ install-html-flex: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in flex" ; \
+       echo "Doing install-html in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9031,7 +9172,7 @@ installcheck-flex: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in flex" ; \
+       echo "Doing installcheck in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9056,7 +9197,7 @@ mostlyclean-flex:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in flex" ; \
+       echo "Doing mostlyclean in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9081,7 +9222,7 @@ clean-flex:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in flex" ; \
+       echo "Doing clean in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9106,7 +9247,7 @@ distclean-flex:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in flex" ; \
+       echo "Doing distclean in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9131,7 +9272,7 @@ maintainer-clean-flex:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in flex" ; \
+       echo "Doing maintainer-clean in flex"; \
        (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9155,7 +9296,7 @@ configure-gas:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/gas; \
        cd "$(HOST_SUBDIR)/gas" || exit 1; \
@@ -9190,8 +9331,8 @@ configure-stage1-gas:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/gas; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \
        cd $(HOST_SUBDIR)/gas || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -9223,8 +9364,8 @@ configure-stage2-gas:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/gas; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \
        cd $(HOST_SUBDIR)/gas || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -9236,7 +9377,7 @@ configure-stage2-gas:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
@@ -9256,8 +9397,8 @@ configure-stage3-gas:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/gas; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \
        cd $(HOST_SUBDIR)/gas || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -9269,7 +9410,7 @@ configure-stage3-gas:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
@@ -9289,8 +9430,8 @@ configure-stage4-gas:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/gas; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \
        cd $(HOST_SUBDIR)/gas || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -9302,7 +9443,7 @@ configure-stage4-gas:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
@@ -9322,8 +9463,8 @@ configure-stageprofile-gas:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/gas; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \
        cd $(HOST_SUBDIR)/gas || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -9335,7 +9476,7 @@ configure-stageprofile-gas:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
@@ -9355,8 +9496,8 @@ configure-stagefeedback-gas:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/gas; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \
        cd $(HOST_SUBDIR)/gas || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -9368,7 +9509,7 @@ configure-stagefeedback-gas:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
@@ -9654,9 +9795,9 @@ check-gas:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif gas
 
@@ -9706,7 +9847,7 @@ info-gas: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gas" ; \
+       echo "Doing info in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9731,7 +9872,7 @@ dvi-gas: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gas" ; \
+       echo "Doing dvi in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9756,7 +9897,7 @@ pdf-gas: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gas" ; \
+       echo "Doing pdf in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9781,7 +9922,7 @@ html-gas: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gas" ; \
+       echo "Doing html in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9806,7 +9947,7 @@ TAGS-gas: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gas" ; \
+       echo "Doing TAGS in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9832,7 +9973,7 @@ install-info-gas: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gas" ; \
+       echo "Doing install-info in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9858,7 +9999,7 @@ install-pdf-gas: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in gas" ; \
+       echo "Doing install-pdf in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9884,7 +10025,7 @@ install-html-gas: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in gas" ; \
+       echo "Doing install-html in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9909,7 +10050,7 @@ installcheck-gas: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gas" ; \
+       echo "Doing installcheck in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9933,7 +10074,7 @@ mostlyclean-gas:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gas" ; \
+       echo "Doing mostlyclean in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9957,7 +10098,7 @@ clean-gas:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gas" ; \
+       echo "Doing clean in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -9981,7 +10122,7 @@ distclean-gas:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gas" ; \
+       echo "Doing distclean in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10005,7 +10146,7 @@ maintainer-clean-gas:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gas" ; \
+       echo "Doing maintainer-clean in gas"; \
        (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10029,7 +10170,7 @@ configure-gcc:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/gcc; \
        cd "$(HOST_SUBDIR)/gcc" || exit 1; \
@@ -10064,8 +10205,8 @@ configure-stage1-gcc:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/gcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \
        cd $(HOST_SUBDIR)/gcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10097,8 +10238,8 @@ configure-stage2-gcc:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/gcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \
        cd $(HOST_SUBDIR)/gcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10110,7 +10251,7 @@ configure-stage2-gcc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
@@ -10130,8 +10271,8 @@ configure-stage3-gcc:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/gcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \
        cd $(HOST_SUBDIR)/gcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10143,7 +10284,7 @@ configure-stage3-gcc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
@@ -10163,8 +10304,8 @@ configure-stage4-gcc:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/gcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \
        cd $(HOST_SUBDIR)/gcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10176,7 +10317,7 @@ configure-stage4-gcc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
@@ -10196,8 +10337,8 @@ configure-stageprofile-gcc:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/gcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \
        cd $(HOST_SUBDIR)/gcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10209,7 +10350,7 @@ configure-stageprofile-gcc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
@@ -10229,8 +10370,8 @@ configure-stagefeedback-gcc:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/gcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \
        cd $(HOST_SUBDIR)/gcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10242,7 +10383,7 @@ configure-stagefeedback-gcc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
@@ -10528,9 +10669,9 @@ check-gcc:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check)
+         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif gcc
 
@@ -10580,7 +10721,7 @@ info-gcc: \
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gcc" ; \
+       echo "Doing info in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10605,7 +10746,7 @@ dvi-gcc: \
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gcc" ; \
+       echo "Doing dvi in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10630,7 +10771,7 @@ pdf-gcc: \
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gcc" ; \
+       echo "Doing pdf in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10655,7 +10796,7 @@ html-gcc: \
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gcc" ; \
+       echo "Doing html in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10680,7 +10821,7 @@ TAGS-gcc: \
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gcc" ; \
+       echo "Doing TAGS in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10706,7 +10847,7 @@ install-info-gcc: \
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gcc" ; \
+       echo "Doing install-info in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10732,7 +10873,7 @@ install-pdf-gcc: \
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in gcc" ; \
+       echo "Doing install-pdf in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10758,7 +10899,7 @@ install-html-gcc: \
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in gcc" ; \
+       echo "Doing install-html in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10783,7 +10924,7 @@ installcheck-gcc: \
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gcc" ; \
+       echo "Doing installcheck in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10807,7 +10948,7 @@ mostlyclean-gcc:
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gcc" ; \
+       echo "Doing mostlyclean in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10831,7 +10972,7 @@ clean-gcc:
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gcc" ; \
+       echo "Doing clean in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10855,7 +10996,7 @@ distclean-gcc:
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gcc" ; \
+       echo "Doing distclean in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10879,7 +11020,7 @@ maintainer-clean-gcc:
        for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gcc" ; \
+       echo "Doing maintainer-clean in gcc"; \
        (cd $(HOST_SUBDIR)/gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10903,7 +11044,7 @@ configure-gmp:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/gmp; \
        cd "$(HOST_SUBDIR)/gmp" || exit 1; \
@@ -10917,7 +11058,7 @@ configure-gmp:
          $$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} --disable-shared \
+         --target=none-${host_vendor}-${host_os} --disable-shared LEX="touch lex.yy.c" \
          || exit 1
 @endif gmp
 
@@ -10938,8 +11079,8 @@ configure-stage1-gmp:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/gmp; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
        cd $(HOST_SUBDIR)/gmp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10953,7 +11094,7 @@ configure-stage1-gmp:
          --target=none-${host_vendor}-${host_os} \
           \
          $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared
+         --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
 .PHONY: configure-stage2-gmp maybe-configure-stage2-gmp
@@ -10972,8 +11113,8 @@ configure-stage2-gmp:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/gmp; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
        cd $(HOST_SUBDIR)/gmp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10985,9 +11126,9 @@ configure-stage2-gmp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
          --target=none-${host_vendor}-${host_os} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS) \
-         --disable-shared
+         --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
 .PHONY: configure-stage3-gmp maybe-configure-stage3-gmp
@@ -11006,8 +11147,8 @@ configure-stage3-gmp:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/gmp; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
        cd $(HOST_SUBDIR)/gmp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11019,9 +11160,9 @@ configure-stage3-gmp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
          --target=none-${host_vendor}-${host_os} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared
+         --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
 .PHONY: configure-stage4-gmp maybe-configure-stage4-gmp
@@ -11040,8 +11181,8 @@ configure-stage4-gmp:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/gmp; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
        cd $(HOST_SUBDIR)/gmp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11053,9 +11194,9 @@ configure-stage4-gmp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
          --target=none-${host_vendor}-${host_os} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared
+         --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
 .PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp
@@ -11074,8 +11215,8 @@ configure-stageprofile-gmp:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/gmp; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
        cd $(HOST_SUBDIR)/gmp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11087,9 +11228,9 @@ configure-stageprofile-gmp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
          --target=none-${host_vendor}-${host_os} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared
+         --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
 .PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp
@@ -11108,8 +11249,8 @@ configure-stagefeedback-gmp:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/gmp; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
        cd $(HOST_SUBDIR)/gmp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11121,9 +11262,9 @@ configure-stagefeedback-gmp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
          --target=none-${host_vendor}-${host_os} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared
+         --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
 
@@ -11408,9 +11549,9 @@ check-gmp:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/gmp && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif gmp
 
@@ -11448,7 +11589,7 @@ info-gmp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gmp" ; \
+       echo "Doing info in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11473,7 +11614,7 @@ dvi-gmp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gmp" ; \
+       echo "Doing dvi in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11498,7 +11639,7 @@ pdf-gmp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gmp" ; \
+       echo "Doing pdf in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11523,7 +11664,7 @@ html-gmp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gmp" ; \
+       echo "Doing html in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11548,7 +11689,7 @@ TAGS-gmp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gmp" ; \
+       echo "Doing TAGS in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11574,7 +11715,7 @@ install-info-gmp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gmp" ; \
+       echo "Doing install-info in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11600,7 +11741,7 @@ install-pdf-gmp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in gmp" ; \
+       echo "Doing install-pdf in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11626,7 +11767,7 @@ install-html-gmp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in gmp" ; \
+       echo "Doing install-html in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11651,7 +11792,7 @@ installcheck-gmp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gmp" ; \
+       echo "Doing installcheck in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11675,7 +11816,7 @@ mostlyclean-gmp:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gmp" ; \
+       echo "Doing mostlyclean in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11699,7 +11840,7 @@ clean-gmp:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gmp" ; \
+       echo "Doing clean in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11723,7 +11864,7 @@ distclean-gmp:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gmp" ; \
+       echo "Doing distclean in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11747,7 +11888,7 @@ maintainer-clean-gmp:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gmp" ; \
+       echo "Doing maintainer-clean in gmp"; \
        (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11771,7 +11912,7 @@ configure-mpfr:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/mpfr; \
        cd "$(HOST_SUBDIR)/mpfr" || exit 1; \
@@ -11806,8 +11947,8 @@ configure-stage1-mpfr:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
        cd $(HOST_SUBDIR)/mpfr || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11840,8 +11981,8 @@ configure-stage2-mpfr:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
        cd $(HOST_SUBDIR)/mpfr || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11853,7 +11994,7 @@ configure-stage2-mpfr:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
@@ -11874,8 +12015,8 @@ configure-stage3-mpfr:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
        cd $(HOST_SUBDIR)/mpfr || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11887,7 +12028,7 @@ configure-stage3-mpfr:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
@@ -11908,8 +12049,8 @@ configure-stage4-mpfr:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
        cd $(HOST_SUBDIR)/mpfr || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11921,7 +12062,7 @@ configure-stage4-mpfr:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
@@ -11942,8 +12083,8 @@ configure-stageprofile-mpfr:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/mpfr; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
        cd $(HOST_SUBDIR)/mpfr || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11955,7 +12096,7 @@ configure-stageprofile-mpfr:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
@@ -11976,8 +12117,8 @@ configure-stagefeedback-mpfr:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
        cd $(HOST_SUBDIR)/mpfr || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11989,7 +12130,7 @@ configure-stagefeedback-mpfr:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
@@ -12276,9 +12417,9 @@ check-mpfr:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/mpfr && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif mpfr
 
@@ -12316,7 +12457,7 @@ info-mpfr: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in mpfr" ; \
+       echo "Doing info in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12341,7 +12482,7 @@ dvi-mpfr: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in mpfr" ; \
+       echo "Doing dvi in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12366,7 +12507,7 @@ pdf-mpfr: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in mpfr" ; \
+       echo "Doing pdf in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12391,7 +12532,7 @@ html-mpfr: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in mpfr" ; \
+       echo "Doing html in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12416,7 +12557,7 @@ TAGS-mpfr: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in mpfr" ; \
+       echo "Doing TAGS in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12442,7 +12583,7 @@ install-info-mpfr: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in mpfr" ; \
+       echo "Doing install-info in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12468,7 +12609,7 @@ install-pdf-mpfr: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in mpfr" ; \
+       echo "Doing install-pdf in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12494,7 +12635,7 @@ install-html-mpfr: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in mpfr" ; \
+       echo "Doing install-html in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12519,7 +12660,7 @@ installcheck-mpfr: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in mpfr" ; \
+       echo "Doing installcheck in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12543,7 +12684,7 @@ mostlyclean-mpfr:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in mpfr" ; \
+       echo "Doing mostlyclean in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12567,7 +12708,7 @@ clean-mpfr:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in mpfr" ; \
+       echo "Doing clean in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12591,7 +12732,7 @@ distclean-mpfr:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in mpfr" ; \
+       echo "Doing distclean in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12615,7 +12756,7 @@ maintainer-clean-mpfr:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in mpfr" ; \
+       echo "Doing maintainer-clean in mpfr"; \
        (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12639,7 +12780,7 @@ configure-mpc:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/mpc; \
        cd "$(HOST_SUBDIR)/mpc" || exit 1; \
@@ -12674,8 +12815,8 @@ configure-stage1-mpc:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/mpc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/mpc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
        cd $(HOST_SUBDIR)/mpc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -12708,8 +12849,8 @@ configure-stage2-mpc:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/mpc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/mpc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
        cd $(HOST_SUBDIR)/mpc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -12721,7 +12862,7 @@ configure-stage2-mpc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
@@ -12742,8 +12883,8 @@ configure-stage3-mpc:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/mpc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/mpc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
        cd $(HOST_SUBDIR)/mpc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -12755,7 +12896,7 @@ configure-stage3-mpc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
@@ -12776,8 +12917,8 @@ configure-stage4-mpc:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/mpc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/mpc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
        cd $(HOST_SUBDIR)/mpc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -12789,7 +12930,7 @@ configure-stage4-mpc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
@@ -12810,8 +12951,8 @@ configure-stageprofile-mpc:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/mpc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/mpc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
        cd $(HOST_SUBDIR)/mpc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -12823,7 +12964,7 @@ configure-stageprofile-mpc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
@@ -12844,8 +12985,8 @@ configure-stagefeedback-mpc:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/mpc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/mpc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
        cd $(HOST_SUBDIR)/mpc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -12857,7 +12998,7 @@ configure-stagefeedback-mpc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
          --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
@@ -13144,9 +13285,9 @@ check-mpc:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/mpc && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif mpc
 
@@ -13184,7 +13325,7 @@ info-mpc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in mpc" ; \
+       echo "Doing info in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13209,7 +13350,7 @@ dvi-mpc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in mpc" ; \
+       echo "Doing dvi in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13234,7 +13375,7 @@ pdf-mpc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in mpc" ; \
+       echo "Doing pdf in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13259,7 +13400,7 @@ html-mpc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in mpc" ; \
+       echo "Doing html in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13284,7 +13425,7 @@ TAGS-mpc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in mpc" ; \
+       echo "Doing TAGS in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13310,7 +13451,7 @@ install-info-mpc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in mpc" ; \
+       echo "Doing install-info in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13336,7 +13477,7 @@ install-pdf-mpc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in mpc" ; \
+       echo "Doing install-pdf in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13362,7 +13503,7 @@ install-html-mpc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in mpc" ; \
+       echo "Doing install-html in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13387,7 +13528,7 @@ installcheck-mpc: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in mpc" ; \
+       echo "Doing installcheck in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13411,7 +13552,7 @@ mostlyclean-mpc:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in mpc" ; \
+       echo "Doing mostlyclean in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13435,7 +13576,7 @@ clean-mpc:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in mpc" ; \
+       echo "Doing clean in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13459,7 +13600,7 @@ distclean-mpc:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in mpc" ; \
+       echo "Doing distclean in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13483,7 +13624,7 @@ maintainer-clean-mpc:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in mpc" ; \
+       echo "Doing maintainer-clean in mpc"; \
        (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -13507,7 +13648,7 @@ configure-isl:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/isl/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/isl; \
        cd "$(HOST_SUBDIR)/isl" || exit 1; \
@@ -13542,8 +13683,8 @@ configure-stage1-isl:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/isl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/isl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \
        cd $(HOST_SUBDIR)/isl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -13576,8 +13717,8 @@ configure-stage2-isl:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/isl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/isl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \
        cd $(HOST_SUBDIR)/isl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -13589,7 +13730,7 @@ configure-stage2-isl:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS) \
          --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
@@ -13610,8 +13751,8 @@ configure-stage3-isl:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/isl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/isl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \
        cd $(HOST_SUBDIR)/isl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -13623,7 +13764,7 @@ configure-stage3-isl:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS) \
          --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
@@ -13644,8 +13785,8 @@ configure-stage4-isl:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/isl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/isl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \
        cd $(HOST_SUBDIR)/isl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -13657,7 +13798,7 @@ configure-stage4-isl:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS) \
          --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
@@ -13678,8 +13819,8 @@ configure-stageprofile-isl:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/isl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/isl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \
        cd $(HOST_SUBDIR)/isl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -13691,7 +13832,7 @@ configure-stageprofile-isl:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS) \
          --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
@@ -13712,8 +13853,8 @@ configure-stagefeedback-isl:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/isl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/isl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \
        cd $(HOST_SUBDIR)/isl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -13725,7 +13866,7 @@ configure-stagefeedback-isl:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
          --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
@@ -14012,9 +14153,9 @@ check-isl:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/isl && \
-         $(MAKE) $(FLAGS_TO_PASS) V=1 check)
+         $(MAKE) $(FLAGS_TO_PASS) V=1 $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif isl
 
@@ -14052,7 +14193,7 @@ info-isl: \
        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" ; \
+       echo "Doing info in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14077,7 +14218,7 @@ dvi-isl: \
        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" ; \
+       echo "Doing dvi in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14102,7 +14243,7 @@ pdf-isl: \
        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" ; \
+       echo "Doing pdf in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14127,7 +14268,7 @@ html-isl: \
        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" ; \
+       echo "Doing html in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14152,7 +14293,7 @@ TAGS-isl: \
        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" ; \
+       echo "Doing TAGS in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14178,7 +14319,7 @@ install-info-isl: \
        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" ; \
+       echo "Doing install-info in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14204,7 +14345,7 @@ install-pdf-isl: \
        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" ; \
+       echo "Doing install-pdf in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14230,7 +14371,7 @@ install-html-isl: \
        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" ; \
+       echo "Doing install-html in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14255,7 +14396,7 @@ installcheck-isl: \
        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" ; \
+       echo "Doing installcheck in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14279,7 +14420,7 @@ mostlyclean-isl:
        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" ; \
+       echo "Doing mostlyclean in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14303,7 +14444,7 @@ clean-isl:
        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" ; \
+       echo "Doing clean in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14327,7 +14468,7 @@ distclean-isl:
        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" ; \
+       echo "Doing distclean in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14351,7 +14492,7 @@ maintainer-clean-isl:
        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" ; \
+       echo "Doing maintainer-clean in isl"; \
        (cd $(HOST_SUBDIR)/isl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -14364,278 +14505,278 @@ maintainer-clean-isl:
 
 
 
-.PHONY: configure-cloog maybe-configure-cloog
-maybe-configure-cloog:
+.PHONY: configure-libelf maybe-configure-libelf
+maybe-configure-libelf:
 @if gcc-bootstrap
-configure-cloog: stage_current
+configure-libelf: stage_current
 @endif gcc-bootstrap
-@if cloog
-maybe-configure-cloog: configure-cloog
-configure-cloog
+@if libelf
+maybe-configure-libelf: configure-libelf
+configure-libelf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       $(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; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libelf; \
+       cd "$(HOST_SUBDIR)/libelf" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=cloog; \
+       module_srcdir=libelf; \
        $(SHELL) \
          $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \
+         --target=${target_alias} --disable-shared \
          || exit 1
-@endif cloog
+@endif libelf
 
 
 
-.PHONY: configure-stage1-cloog maybe-configure-stage1-cloog
-maybe-configure-stage1-cloog:
-@if cloog-bootstrap
-maybe-configure-stage1-cloog: configure-stage1-cloog
-configure-stage1-cloog:
+.PHONY: configure-stage1-libelf maybe-configure-stage1-libelf
+maybe-configure-stage1-libelf:
+@if libelf-bootstrap
+maybe-configure-stage1-libelf: configure-stage1-libelf
+configure-stage1-libelf:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-       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; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/libelf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       cd $(HOST_SUBDIR)/libelf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=cloog; \
+       module_srcdir=libelf; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
           \
          $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-@endif cloog-bootstrap
-
-.PHONY: configure-stage2-cloog maybe-configure-stage2-cloog
-maybe-configure-stage2-cloog:
-@if cloog-bootstrap
-maybe-configure-stage2-cloog: configure-stage2-cloog
-configure-stage2-cloog:
+         --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stage2-libelf maybe-configure-stage2-libelf
+maybe-configure-stage2-libelf:
+@if libelf-bootstrap
+maybe-configure-stage2-libelf: configure-stage2-libelf
+configure-stage2-libelf:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
-       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; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/libelf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       cd $(HOST_SUBDIR)/libelf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=cloog; \
+       module_srcdir=libelf; \
        $(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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-@endif cloog-bootstrap
-
-.PHONY: configure-stage3-cloog maybe-configure-stage3-cloog
-maybe-configure-stage3-cloog:
-@if cloog-bootstrap
-maybe-configure-stage3-cloog: configure-stage3-cloog
-configure-stage3-cloog:
+         --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stage3-libelf maybe-configure-stage3-libelf
+maybe-configure-stage3-libelf:
+@if libelf-bootstrap
+maybe-configure-stage3-libelf: configure-stage3-libelf
+configure-stage3-libelf:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
-       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; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/libelf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       cd $(HOST_SUBDIR)/libelf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=cloog; \
+       module_srcdir=libelf; \
        $(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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-@endif cloog-bootstrap
-
-.PHONY: configure-stage4-cloog maybe-configure-stage4-cloog
-maybe-configure-stage4-cloog:
-@if cloog-bootstrap
-maybe-configure-stage4-cloog: configure-stage4-cloog
-configure-stage4-cloog:
+         --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stage4-libelf maybe-configure-stage4-libelf
+maybe-configure-stage4-libelf:
+@if libelf-bootstrap
+maybe-configure-stage4-libelf: configure-stage4-libelf
+configure-stage4-libelf:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
-       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; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/libelf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       cd $(HOST_SUBDIR)/libelf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=cloog; \
+       module_srcdir=libelf; \
        $(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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-@endif cloog-bootstrap
-
-.PHONY: configure-stageprofile-cloog maybe-configure-stageprofile-cloog
-maybe-configure-stageprofile-cloog:
-@if cloog-bootstrap
-maybe-configure-stageprofile-cloog: configure-stageprofile-cloog
-configure-stageprofile-cloog:
+         --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stageprofile-libelf maybe-configure-stageprofile-libelf
+maybe-configure-stageprofile-libelf:
+@if libelf-bootstrap
+maybe-configure-stageprofile-libelf: configure-stageprofile-libelf
+configure-stageprofile-libelf:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
-       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; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libelf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       cd $(HOST_SUBDIR)/libelf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=cloog; \
+       module_srcdir=libelf; \
        $(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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-@endif cloog-bootstrap
-
-.PHONY: configure-stagefeedback-cloog maybe-configure-stagefeedback-cloog
-maybe-configure-stagefeedback-cloog:
-@if cloog-bootstrap
-maybe-configure-stagefeedback-cloog: configure-stagefeedback-cloog
-configure-stagefeedback-cloog:
+         --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stagefeedback-libelf maybe-configure-stagefeedback-libelf
+maybe-configure-stagefeedback-libelf:
+@if libelf-bootstrap
+maybe-configure-stagefeedback-libelf: configure-stagefeedback-libelf
+configure-stagefeedback-libelf:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
-       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; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/libelf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       cd $(HOST_SUBDIR)/libelf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=cloog; \
+       module_srcdir=libelf; \
        $(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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-@endif cloog-bootstrap
+         --disable-shared
+@endif libelf-bootstrap
 
 
 
 
 
-.PHONY: all-cloog maybe-all-cloog
-maybe-all-cloog:
+.PHONY: all-libelf maybe-all-libelf
+maybe-all-libelf:
 @if gcc-bootstrap
-all-cloog: stage_current
+all-libelf: stage_current
 @endif gcc-bootstrap
-@if cloog
-TARGET-cloog=all
-maybe-all-cloog: all-cloog
-all-cloog: configure-cloog
+@if libelf
+TARGET-libelf=all
+maybe-all-libelf: all-libelf
+all-libelf: configure-libelf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(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) $(STAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
-               $(TARGET-cloog))
-@endif cloog
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libelf && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libelf))
+@endif libelf
 
 
 
-.PHONY: all-stage1-cloog maybe-all-stage1-cloog
-.PHONY: clean-stage1-cloog maybe-clean-stage1-cloog
-maybe-all-stage1-cloog:
-maybe-clean-stage1-cloog:
-@if cloog-bootstrap
-maybe-all-stage1-cloog: all-stage1-cloog
-all-stage1: all-stage1-cloog
-TARGET-stage1-cloog = $(TARGET-cloog)
-all-stage1-cloog: configure-stage1-cloog
+.PHONY: all-stage1-libelf maybe-all-stage1-libelf
+.PHONY: clean-stage1-libelf maybe-clean-stage1-libelf
+maybe-all-stage1-libelf:
+maybe-clean-stage1-libelf:
+@if libelf-bootstrap
+maybe-all-stage1-libelf: all-stage1-libelf
+all-stage1: all-stage1-libelf
+TARGET-stage1-libelf = $(TARGET-libelf)
+all-stage1-libelf: configure-stage1-libelf
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(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 && \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -14644,41 +14785,41 @@ all-stage1-cloog: configure-stage1-cloog
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS)  \
-               $(STAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
+               $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-cloog)
+               $(TARGET-stage1-libelf)
 
-maybe-clean-stage1-cloog: clean-stage1-cloog
-clean-stage1: clean-stage1-cloog
-clean-stage1-cloog:
+maybe-clean-stage1-libelf: clean-stage1-libelf
+clean-stage1: clean-stage1-libelf
+clean-stage1-libelf:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-libelf/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/cloog && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-       $(STAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
-@endif cloog-bootstrap
-
-
-.PHONY: all-stage2-cloog maybe-all-stage2-cloog
-.PHONY: clean-stage2-cloog maybe-clean-stage2-cloog
-maybe-all-stage2-cloog:
-maybe-clean-stage2-cloog:
-@if cloog-bootstrap
-maybe-all-stage2-cloog: all-stage2-cloog
-all-stage2: all-stage2-cloog
-TARGET-stage2-cloog = $(TARGET-cloog)
-all-stage2-cloog: configure-stage2-cloog
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stage2-libelf maybe-all-stage2-libelf
+.PHONY: clean-stage2-libelf maybe-clean-stage2-libelf
+maybe-all-stage2-libelf:
+maybe-clean-stage2-libelf:
+@if libelf-bootstrap
+maybe-all-stage2-libelf: all-stage2-libelf
+all-stage2: all-stage2-libelf
+TARGET-stage2-libelf = $(TARGET-libelf)
+all-stage2-libelf: configure-stage2-libelf
        @[ $(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) 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 && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -14686,40 +14827,40 @@ all-stage2-cloog: configure-stage2-cloog
                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) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-cloog)
+               $(TARGET-stage2-libelf)
 
-maybe-clean-stage2-cloog: clean-stage2-cloog
-clean-stage2: clean-stage2-cloog
-clean-stage2-cloog:
+maybe-clean-stage2-libelf: clean-stage2-libelf
+clean-stage2: clean-stage2-libelf
+clean-stage2-libelf:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-libelf/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
-@endif cloog-bootstrap
-
-
-.PHONY: all-stage3-cloog maybe-all-stage3-cloog
-.PHONY: clean-stage3-cloog maybe-clean-stage3-cloog
-maybe-all-stage3-cloog:
-maybe-clean-stage3-cloog:
-@if cloog-bootstrap
-maybe-all-stage3-cloog: all-stage3-cloog
-all-stage3: all-stage3-cloog
-TARGET-stage3-cloog = $(TARGET-cloog)
-all-stage3-cloog: configure-stage3-cloog
+       cd $(HOST_SUBDIR)/libelf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stage3-libelf maybe-all-stage3-libelf
+.PHONY: clean-stage3-libelf maybe-clean-stage3-libelf
+maybe-all-stage3-libelf:
+maybe-clean-stage3-libelf:
+@if libelf-bootstrap
+maybe-all-stage3-libelf: all-stage3-libelf
+all-stage3: all-stage3-libelf
+TARGET-stage3-libelf = $(TARGET-libelf)
+all-stage3-libelf: configure-stage3-libelf
        @[ $(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) 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 && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -14727,40 +14868,40 @@ all-stage3-cloog: configure-stage3-cloog
                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) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-cloog)
+               $(TARGET-stage3-libelf)
 
-maybe-clean-stage3-cloog: clean-stage3-cloog
-clean-stage3: clean-stage3-cloog
-clean-stage3-cloog:
+maybe-clean-stage3-libelf: clean-stage3-libelf
+clean-stage3: clean-stage3-libelf
+clean-stage3-libelf:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-libelf/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
-@endif cloog-bootstrap
-
-
-.PHONY: all-stage4-cloog maybe-all-stage4-cloog
-.PHONY: clean-stage4-cloog maybe-clean-stage4-cloog
-maybe-all-stage4-cloog:
-maybe-clean-stage4-cloog:
-@if cloog-bootstrap
-maybe-all-stage4-cloog: all-stage4-cloog
-all-stage4: all-stage4-cloog
-TARGET-stage4-cloog = $(TARGET-cloog)
-all-stage4-cloog: configure-stage4-cloog
+       cd $(HOST_SUBDIR)/libelf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stage4-libelf maybe-all-stage4-libelf
+.PHONY: clean-stage4-libelf maybe-clean-stage4-libelf
+maybe-all-stage4-libelf:
+maybe-clean-stage4-libelf:
+@if libelf-bootstrap
+maybe-all-stage4-libelf: all-stage4-libelf
+all-stage4: all-stage4-libelf
+TARGET-stage4-libelf = $(TARGET-libelf)
+all-stage4-libelf: configure-stage4-libelf
        @[ $(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) 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 && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -14768,40 +14909,40 @@ all-stage4-cloog: configure-stage4-cloog
                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) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-cloog)
+               $(TARGET-stage4-libelf)
 
-maybe-clean-stage4-cloog: clean-stage4-cloog
-clean-stage4: clean-stage4-cloog
-clean-stage4-cloog:
+maybe-clean-stage4-libelf: clean-stage4-libelf
+clean-stage4: clean-stage4-libelf
+clean-stage4-libelf:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-libelf/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
-@endif cloog-bootstrap
-
-
-.PHONY: all-stageprofile-cloog maybe-all-stageprofile-cloog
-.PHONY: clean-stageprofile-cloog maybe-clean-stageprofile-cloog
-maybe-all-stageprofile-cloog:
-maybe-clean-stageprofile-cloog:
-@if cloog-bootstrap
-maybe-all-stageprofile-cloog: all-stageprofile-cloog
-all-stageprofile: all-stageprofile-cloog
-TARGET-stageprofile-cloog = $(TARGET-cloog)
-all-stageprofile-cloog: configure-stageprofile-cloog
+       cd $(HOST_SUBDIR)/libelf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stageprofile-libelf maybe-all-stageprofile-libelf
+.PHONY: clean-stageprofile-libelf maybe-clean-stageprofile-libelf
+maybe-all-stageprofile-libelf:
+maybe-clean-stageprofile-libelf:
+@if libelf-bootstrap
+maybe-all-stageprofile-libelf: all-stageprofile-libelf
+all-stageprofile: all-stageprofile-libelf
+TARGET-stageprofile-libelf = $(TARGET-libelf)
+all-stageprofile-libelf: configure-stageprofile-libelf
        @[ $(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) 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 && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -14809,40 +14950,40 @@ all-stageprofile-cloog: configure-stageprofile-cloog
                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) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-cloog)
+               $(TARGET-stageprofile-libelf)
 
-maybe-clean-stageprofile-cloog: clean-stageprofile-cloog
-clean-stageprofile: clean-stageprofile-cloog
-clean-stageprofile-cloog:
+maybe-clean-stageprofile-libelf: clean-stageprofile-libelf
+clean-stageprofile: clean-stageprofile-libelf
+clean-stageprofile-libelf:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-libelf/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
-@endif cloog-bootstrap
-
-
-.PHONY: all-stagefeedback-cloog maybe-all-stagefeedback-cloog
-.PHONY: clean-stagefeedback-cloog maybe-clean-stagefeedback-cloog
-maybe-all-stagefeedback-cloog:
-maybe-clean-stagefeedback-cloog:
-@if cloog-bootstrap
-maybe-all-stagefeedback-cloog: all-stagefeedback-cloog
-all-stagefeedback: all-stagefeedback-cloog
-TARGET-stagefeedback-cloog = $(TARGET-cloog)
-all-stagefeedback-cloog: configure-stagefeedback-cloog
+       cd $(HOST_SUBDIR)/libelf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stagefeedback-libelf maybe-all-stagefeedback-libelf
+.PHONY: clean-stagefeedback-libelf maybe-clean-stagefeedback-libelf
+maybe-all-stagefeedback-libelf:
+maybe-clean-stagefeedback-libelf:
+@if libelf-bootstrap
+maybe-all-stagefeedback-libelf: all-stagefeedback-libelf
+all-stagefeedback: all-stagefeedback-libelf
+TARGET-stagefeedback-libelf = $(TARGET-libelf)
+all-stagefeedback-libelf: configure-stagefeedback-libelf
        @[ $(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) 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 && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -14850,78 +14991,78 @@ all-stagefeedback-cloog: configure-stagefeedback-cloog
                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) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-cloog)
+               $(TARGET-stagefeedback-libelf)
 
-maybe-clean-stagefeedback-cloog: clean-stagefeedback-cloog
-clean-stagefeedback: clean-stagefeedback-cloog
-clean-stagefeedback-cloog:
+maybe-clean-stagefeedback-libelf: clean-stagefeedback-libelf
+clean-stagefeedback: clean-stagefeedback-libelf
+clean-stagefeedback-libelf:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libelf/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
-@endif cloog-bootstrap
+       cd $(HOST_SUBDIR)/libelf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
 
 
 
 
 
-.PHONY: check-cloog maybe-check-cloog
-maybe-check-cloog:
-@if cloog
-maybe-check-cloog: check-cloog
+.PHONY: check-libelf maybe-check-libelf
+maybe-check-libelf:
+@if libelf
+maybe-check-libelf: check-libelf
 
-check-cloog:
+check-libelf:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/cloog && \
-         $(MAKE) $(FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libelf && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif cloog
+@endif libelf
 
-.PHONY: install-cloog maybe-install-cloog
-maybe-install-cloog:
-@if cloog
-maybe-install-cloog: install-cloog
+.PHONY: install-libelf maybe-install-libelf
+maybe-install-libelf:
+@if libelf
+maybe-install-libelf: install-libelf
 
-install-cloog:
+install-libelf:
 
-@endif cloog
+@endif libelf
 
-.PHONY: install-strip-cloog maybe-install-strip-cloog
-maybe-install-strip-cloog:
-@if cloog
-maybe-install-strip-cloog: install-strip-cloog
+.PHONY: install-strip-libelf maybe-install-strip-libelf
+maybe-install-strip-libelf:
+@if libelf
+maybe-install-strip-libelf: install-strip-libelf
 
-install-strip-cloog:
+install-strip-libelf:
 
-@endif cloog
+@endif libelf
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-cloog info-cloog
-maybe-info-cloog:
-@if cloog
-maybe-info-cloog: info-cloog
+.PHONY: maybe-info-libelf info-libelf
+maybe-info-libelf:
+@if libelf
+maybe-info-libelf: info-libelf
 
-info-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+info-libelf: \
+    configure-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing info in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14929,24 +15070,24 @@ info-cloog: \
                  info) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
-.PHONY: maybe-dvi-cloog dvi-cloog
-maybe-dvi-cloog:
-@if cloog
-maybe-dvi-cloog: dvi-cloog
+.PHONY: maybe-dvi-libelf dvi-libelf
+maybe-dvi-libelf:
+@if libelf
+maybe-dvi-libelf: dvi-libelf
 
-dvi-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+dvi-libelf: \
+    configure-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing dvi in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14954,24 +15095,24 @@ dvi-cloog: \
                  dvi) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
-.PHONY: maybe-pdf-cloog pdf-cloog
-maybe-pdf-cloog:
-@if cloog
-maybe-pdf-cloog: pdf-cloog
+.PHONY: maybe-pdf-libelf pdf-libelf
+maybe-pdf-libelf:
+@if libelf
+maybe-pdf-libelf: pdf-libelf
 
-pdf-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+pdf-libelf: \
+    configure-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing pdf in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14979,24 +15120,24 @@ pdf-cloog: \
                  pdf) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
-.PHONY: maybe-html-cloog html-cloog
-maybe-html-cloog:
-@if cloog
-maybe-html-cloog: html-cloog
+.PHONY: maybe-html-libelf html-libelf
+maybe-html-libelf:
+@if libelf
+maybe-html-libelf: html-libelf
 
-html-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+html-libelf: \
+    configure-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing html in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15004,24 +15145,24 @@ html-cloog: \
                  html) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
-.PHONY: maybe-TAGS-cloog TAGS-cloog
-maybe-TAGS-cloog:
-@if cloog
-maybe-TAGS-cloog: TAGS-cloog
+.PHONY: maybe-TAGS-libelf TAGS-libelf
+maybe-TAGS-libelf:
+@if libelf
+maybe-TAGS-libelf: TAGS-libelf
 
-TAGS-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+TAGS-libelf: \
+    configure-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing TAGS in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15029,25 +15170,25 @@ TAGS-cloog: \
                  TAGS) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
-.PHONY: maybe-install-info-cloog install-info-cloog
-maybe-install-info-cloog:
-@if cloog
-maybe-install-info-cloog: install-info-cloog
+.PHONY: maybe-install-info-libelf install-info-libelf
+maybe-install-info-libelf:
+@if libelf
+maybe-install-info-libelf: install-info-libelf
 
-install-info-cloog: \
-    configure-cloog \
-    info-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+install-info-libelf: \
+    configure-libelf \
+    info-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing install-info in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15055,25 +15196,25 @@ install-info-cloog: \
                  install-info) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
-.PHONY: maybe-install-pdf-cloog install-pdf-cloog
-maybe-install-pdf-cloog:
-@if cloog
-maybe-install-pdf-cloog: install-pdf-cloog
+.PHONY: maybe-install-pdf-libelf install-pdf-libelf
+maybe-install-pdf-libelf:
+@if libelf
+maybe-install-pdf-libelf: install-pdf-libelf
 
-install-pdf-cloog: \
-    configure-cloog \
-    pdf-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+install-pdf-libelf: \
+    configure-libelf \
+    pdf-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing install-pdf in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15081,25 +15222,25 @@ install-pdf-cloog: \
                  install-pdf) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
-.PHONY: maybe-install-html-cloog install-html-cloog
-maybe-install-html-cloog:
-@if cloog
-maybe-install-html-cloog: install-html-cloog
+.PHONY: maybe-install-html-libelf install-html-libelf
+maybe-install-html-libelf:
+@if libelf
+maybe-install-html-libelf: install-html-libelf
 
-install-html-cloog: \
-    configure-cloog \
-    html-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+install-html-libelf: \
+    configure-libelf \
+    html-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing install-html in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15107,24 +15248,24 @@ install-html-cloog: \
                  install-html) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
-.PHONY: maybe-installcheck-cloog installcheck-cloog
-maybe-installcheck-cloog:
-@if cloog
-maybe-installcheck-cloog: installcheck-cloog
+.PHONY: maybe-installcheck-libelf installcheck-libelf
+maybe-installcheck-libelf:
+@if libelf
+maybe-installcheck-libelf: installcheck-libelf
 
-installcheck-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+installcheck-libelf: \
+    configure-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing installcheck in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15132,23 +15273,23 @@ installcheck-cloog: \
                  installcheck) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
-.PHONY: maybe-mostlyclean-cloog mostlyclean-cloog
-maybe-mostlyclean-cloog:
-@if cloog
-maybe-mostlyclean-cloog: mostlyclean-cloog
+.PHONY: maybe-mostlyclean-libelf mostlyclean-libelf
+maybe-mostlyclean-libelf:
+@if libelf
+maybe-mostlyclean-libelf: mostlyclean-libelf
 
-mostlyclean-cloog
-       @[ -f ./cloog/Makefile ] || exit 0; \
+mostlyclean-libelf
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing mostlyclean in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15156,23 +15297,23 @@ mostlyclean-cloog:
                  mostlyclean) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
-.PHONY: maybe-clean-cloog clean-cloog
-maybe-clean-cloog:
-@if cloog
-maybe-clean-cloog: clean-cloog
+.PHONY: maybe-clean-libelf clean-libelf
+maybe-clean-libelf:
+@if libelf
+maybe-clean-libelf: clean-libelf
 
-clean-cloog
-       @[ -f ./cloog/Makefile ] || exit 0; \
+clean-libelf
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing clean in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15180,23 +15321,23 @@ clean-cloog:
                  clean) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
-.PHONY: maybe-distclean-cloog distclean-cloog
-maybe-distclean-cloog:
-@if cloog
-maybe-distclean-cloog: distclean-cloog
+.PHONY: maybe-distclean-libelf distclean-libelf
+maybe-distclean-libelf:
+@if libelf
+maybe-distclean-libelf: distclean-libelf
 
-distclean-cloog
-       @[ -f ./cloog/Makefile ] || exit 0; \
+distclean-libelf
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing distclean in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15204,23 +15345,23 @@ distclean-cloog:
                  distclean) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
-.PHONY: maybe-maintainer-clean-cloog maintainer-clean-cloog
-maybe-maintainer-clean-cloog:
-@if cloog
-maybe-maintainer-clean-cloog: maintainer-clean-cloog
+.PHONY: maybe-maintainer-clean-libelf maintainer-clean-libelf
+maybe-maintainer-clean-libelf:
+@if libelf
+maybe-maintainer-clean-libelf: maintainer-clean-libelf
 
-maintainer-clean-cloog
-       @[ -f ./cloog/Makefile ] || exit 0; \
+maintainer-clean-libelf
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing maintainer-clean in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15228,282 +15369,276 @@ maintainer-clean-cloog:
                  maintainer-clean) \
          || exit 1
 
-@endif cloog
+@endif libelf
 
 
 
-.PHONY: configure-libelf maybe-configure-libelf
-maybe-configure-libelf:
+.PHONY: configure-gold maybe-configure-gold
+maybe-configure-gold:
 @if gcc-bootstrap
-configure-libelf: stage_current
+configure-gold: stage_current
 @endif gcc-bootstrap
-@if libelf
-maybe-configure-libelf: configure-libelf
-configure-libelf
+@if gold
+maybe-configure-gold: configure-gold
+configure-gold
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libelf; \
-       cd "$(HOST_SUBDIR)/libelf" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gold; \
+       cd "$(HOST_SUBDIR)/gold" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libelf; \
+       module_srcdir=gold; \
        $(SHELL) \
          $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} --disable-shared \
+         --target=${target_alias}  \
          || exit 1
-@endif libelf
+@endif gold
 
 
 
-.PHONY: configure-stage1-libelf maybe-configure-stage1-libelf
-maybe-configure-stage1-libelf:
-@if libelf-bootstrap
-maybe-configure-stage1-libelf: configure-stage1-libelf
-configure-stage1-libelf:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+.PHONY: configure-stage1-gold maybe-configure-stage1-gold
+maybe-configure-stage1-gold:
+@if gold-bootstrap
+maybe-configure-stage1-gold: configure-stage1-gold
+configure-stage1-gold:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/gold/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)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libelf; \
+       module_srcdir=gold; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
           \
-         $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif gold-bootstrap
 
-.PHONY: configure-stage2-libelf maybe-configure-stage2-libelf
-maybe-configure-stage2-libelf:
-@if libelf-bootstrap
-maybe-configure-stage2-libelf: configure-stage2-libelf
-configure-stage2-libelf:
+.PHONY: configure-stage2-gold maybe-configure-stage2-gold
+maybe-configure-stage2-gold:
+@if gold-bootstrap
+maybe-configure-stage2-gold: configure-stage2-gold
+configure-stage2-gold:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/gold/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)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libelf; \
+       module_srcdir=gold; \
        $(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) \
-         --disable-shared
-@endif libelf-bootstrap
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif gold-bootstrap
 
-.PHONY: configure-stage3-libelf maybe-configure-stage3-libelf
-maybe-configure-stage3-libelf:
-@if libelf-bootstrap
-maybe-configure-stage3-libelf: configure-stage3-libelf
-configure-stage3-libelf:
+.PHONY: configure-stage3-gold maybe-configure-stage3-gold
+maybe-configure-stage3-gold:
+@if gold-bootstrap
+maybe-configure-stage3-gold: configure-stage3-gold
+configure-stage3-gold:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/gold/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)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libelf; \
+       module_srcdir=gold; \
        $(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) \
-         --disable-shared
-@endif libelf-bootstrap
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif gold-bootstrap
 
-.PHONY: configure-stage4-libelf maybe-configure-stage4-libelf
-maybe-configure-stage4-libelf:
-@if libelf-bootstrap
-maybe-configure-stage4-libelf: configure-stage4-libelf
-configure-stage4-libelf:
+.PHONY: configure-stage4-gold maybe-configure-stage4-gold
+maybe-configure-stage4-gold:
+@if gold-bootstrap
+maybe-configure-stage4-gold: configure-stage4-gold
+configure-stage4-gold:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/gold/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)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libelf; \
+       module_srcdir=gold; \
        $(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) \
-         --disable-shared
-@endif libelf-bootstrap
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif gold-bootstrap
 
-.PHONY: configure-stageprofile-libelf maybe-configure-stageprofile-libelf
-maybe-configure-stageprofile-libelf:
-@if libelf-bootstrap
-maybe-configure-stageprofile-libelf: configure-stageprofile-libelf
-configure-stageprofile-libelf:
+.PHONY: configure-stageprofile-gold maybe-configure-stageprofile-gold
+maybe-configure-stageprofile-gold:
+@if gold-bootstrap
+maybe-configure-stageprofile-gold: configure-stageprofile-gold
+configure-stageprofile-gold:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/gold/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)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libelf; \
+       module_srcdir=gold; \
        $(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) \
-         --disable-shared
-@endif libelf-bootstrap
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif gold-bootstrap
 
-.PHONY: configure-stagefeedback-libelf maybe-configure-stagefeedback-libelf
-maybe-configure-stagefeedback-libelf:
-@if libelf-bootstrap
-maybe-configure-stagefeedback-libelf: configure-stagefeedback-libelf
-configure-stagefeedback-libelf:
+.PHONY: configure-stagefeedback-gold maybe-configure-stagefeedback-gold
+maybe-configure-stagefeedback-gold:
+@if gold-bootstrap
+maybe-configure-stagefeedback-gold: configure-stagefeedback-gold
+configure-stagefeedback-gold:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/gold/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)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libelf; \
+       module_srcdir=gold; \
        $(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) \
-         --disable-shared
-@endif libelf-bootstrap
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif gold-bootstrap
 
 
 
 
 
-.PHONY: all-libelf maybe-all-libelf
-maybe-all-libelf:
+.PHONY: all-gold maybe-all-gold
+maybe-all-gold:
 @if gcc-bootstrap
-all-libelf: stage_current
+all-gold: stage_current
 @endif gcc-bootstrap
-@if libelf
-TARGET-libelf=all
-maybe-all-libelf: all-libelf
-all-libelf: configure-libelf
+@if gold
+TARGET-gold=all
+maybe-all-gold: all-gold
+all-gold: configure-gold
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/libelf && \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-libelf))
-@endif libelf
+               $(TARGET-gold))
+@endif gold
 
 
 
-.PHONY: all-stage1-libelf maybe-all-stage1-libelf
-.PHONY: clean-stage1-libelf maybe-clean-stage1-libelf
-maybe-all-stage1-libelf:
-maybe-clean-stage1-libelf:
-@if libelf-bootstrap
-maybe-all-stage1-libelf: all-stage1-libelf
-all-stage1: all-stage1-libelf
-TARGET-stage1-libelf = $(TARGET-libelf)
-all-stage1-libelf: configure-stage1-libelf
+.PHONY: all-stage1-gold maybe-all-stage1-gold
+.PHONY: clean-stage1-gold maybe-clean-stage1-gold
+maybe-all-stage1-gold:
+maybe-clean-stage1-gold:
+@if gold-bootstrap
+maybe-all-stage1-gold: all-stage1-gold
+all-stage1: all-stage1-gold
+TARGET-stage1-gold = $(TARGET-gold)
+all-stage1-gold: configure-stage1-gold
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
        $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -15514,39 +15649,39 @@ all-stage1-libelf: configure-stage1-libelf
                $(EXTRA_HOST_FLAGS)  \
                $(STAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-libelf)
+               $(TARGET-stage1-gold)
 
-maybe-clean-stage1-libelf: clean-stage1-libelf
-clean-stage1: clean-stage1-libelf
-clean-stage1-libelf:
+maybe-clean-stage1-gold: clean-stage1-gold
+clean-stage1: clean-stage1-gold
+clean-stage1-gold:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-gold/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
        $(STAGE1_FLAGS_TO_PASS)  clean
-@endif libelf-bootstrap
+@endif gold-bootstrap
 
 
-.PHONY: all-stage2-libelf maybe-all-stage2-libelf
-.PHONY: clean-stage2-libelf maybe-clean-stage2-libelf
-maybe-all-stage2-libelf:
-maybe-clean-stage2-libelf:
-@if libelf-bootstrap
-maybe-all-stage2-libelf: all-stage2-libelf
-all-stage2: all-stage2-libelf
-TARGET-stage2-libelf = $(TARGET-libelf)
-all-stage2-libelf: configure-stage2-libelf
+.PHONY: all-stage2-gold maybe-all-stage2-gold
+.PHONY: clean-stage2-gold maybe-clean-stage2-gold
+maybe-all-stage2-gold:
+maybe-clean-stage2-gold:
+@if gold-bootstrap
+maybe-all-stage2-gold: all-stage2-gold
+all-stage2: all-stage2-gold
+TARGET-stage2-gold = $(TARGET-gold)
+all-stage2-gold: configure-stage2-gold
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -15556,38 +15691,38 @@ all-stage2-libelf: configure-stage2-libelf
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-libelf)
+               $(TARGET-stage2-gold)
 
-maybe-clean-stage2-libelf: clean-stage2-libelf
-clean-stage2: clean-stage2-libelf
-clean-stage2-libelf:
+maybe-clean-stage2-gold: clean-stage2-gold
+clean-stage2: clean-stage2-gold
+clean-stage2-gold:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-gold/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libelf-bootstrap
+@endif gold-bootstrap
 
 
-.PHONY: all-stage3-libelf maybe-all-stage3-libelf
-.PHONY: clean-stage3-libelf maybe-clean-stage3-libelf
-maybe-all-stage3-libelf:
-maybe-clean-stage3-libelf:
-@if libelf-bootstrap
-maybe-all-stage3-libelf: all-stage3-libelf
-all-stage3: all-stage3-libelf
-TARGET-stage3-libelf = $(TARGET-libelf)
-all-stage3-libelf: configure-stage3-libelf
+.PHONY: all-stage3-gold maybe-all-stage3-gold
+.PHONY: clean-stage3-gold maybe-clean-stage3-gold
+maybe-all-stage3-gold:
+maybe-clean-stage3-gold:
+@if gold-bootstrap
+maybe-all-stage3-gold: all-stage3-gold
+all-stage3: all-stage3-gold
+TARGET-stage3-gold = $(TARGET-gold)
+all-stage3-gold: configure-stage3-gold
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -15597,38 +15732,38 @@ all-stage3-libelf: configure-stage3-libelf
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-libelf)
+               $(TARGET-stage3-gold)
 
-maybe-clean-stage3-libelf: clean-stage3-libelf
-clean-stage3: clean-stage3-libelf
-clean-stage3-libelf:
+maybe-clean-stage3-gold: clean-stage3-gold
+clean-stage3: clean-stage3-gold
+clean-stage3-gold:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-gold/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libelf-bootstrap
+@endif gold-bootstrap
 
 
-.PHONY: all-stage4-libelf maybe-all-stage4-libelf
-.PHONY: clean-stage4-libelf maybe-clean-stage4-libelf
-maybe-all-stage4-libelf:
-maybe-clean-stage4-libelf:
-@if libelf-bootstrap
-maybe-all-stage4-libelf: all-stage4-libelf
-all-stage4: all-stage4-libelf
-TARGET-stage4-libelf = $(TARGET-libelf)
-all-stage4-libelf: configure-stage4-libelf
+.PHONY: all-stage4-gold maybe-all-stage4-gold
+.PHONY: clean-stage4-gold maybe-clean-stage4-gold
+maybe-all-stage4-gold:
+maybe-clean-stage4-gold:
+@if gold-bootstrap
+maybe-all-stage4-gold: all-stage4-gold
+all-stage4: all-stage4-gold
+TARGET-stage4-gold = $(TARGET-gold)
+all-stage4-gold: configure-stage4-gold
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -15638,38 +15773,38 @@ all-stage4-libelf: configure-stage4-libelf
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-libelf)
+               $(TARGET-stage4-gold)
 
-maybe-clean-stage4-libelf: clean-stage4-libelf
-clean-stage4: clean-stage4-libelf
-clean-stage4-libelf:
+maybe-clean-stage4-gold: clean-stage4-gold
+clean-stage4: clean-stage4-gold
+clean-stage4-gold:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-gold/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libelf-bootstrap
+@endif gold-bootstrap
 
 
-.PHONY: all-stageprofile-libelf maybe-all-stageprofile-libelf
-.PHONY: clean-stageprofile-libelf maybe-clean-stageprofile-libelf
-maybe-all-stageprofile-libelf:
-maybe-clean-stageprofile-libelf:
-@if libelf-bootstrap
-maybe-all-stageprofile-libelf: all-stageprofile-libelf
-all-stageprofile: all-stageprofile-libelf
-TARGET-stageprofile-libelf = $(TARGET-libelf)
-all-stageprofile-libelf: configure-stageprofile-libelf
+.PHONY: all-stageprofile-gold maybe-all-stageprofile-gold
+.PHONY: clean-stageprofile-gold maybe-clean-stageprofile-gold
+maybe-all-stageprofile-gold:
+maybe-clean-stageprofile-gold:
+@if gold-bootstrap
+maybe-all-stageprofile-gold: all-stageprofile-gold
+all-stageprofile: all-stageprofile-gold
+TARGET-stageprofile-gold = $(TARGET-gold)
+all-stageprofile-gold: configure-stageprofile-gold
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -15679,38 +15814,38 @@ all-stageprofile-libelf: configure-stageprofile-libelf
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-libelf)
+               $(TARGET-stageprofile-gold)
 
-maybe-clean-stageprofile-libelf: clean-stageprofile-libelf
-clean-stageprofile: clean-stageprofile-libelf
-clean-stageprofile-libelf:
+maybe-clean-stageprofile-gold: clean-stageprofile-gold
+clean-stageprofile: clean-stageprofile-gold
+clean-stageprofile-gold:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-gold/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libelf-bootstrap
+@endif gold-bootstrap
 
 
-.PHONY: all-stagefeedback-libelf maybe-all-stagefeedback-libelf
-.PHONY: clean-stagefeedback-libelf maybe-clean-stagefeedback-libelf
-maybe-all-stagefeedback-libelf:
-maybe-clean-stagefeedback-libelf:
-@if libelf-bootstrap
-maybe-all-stagefeedback-libelf: all-stagefeedback-libelf
-all-stagefeedback: all-stagefeedback-libelf
-TARGET-stagefeedback-libelf = $(TARGET-libelf)
-all-stagefeedback-libelf: configure-stagefeedback-libelf
+.PHONY: all-stagefeedback-gold maybe-all-stagefeedback-gold
+.PHONY: clean-stagefeedback-gold maybe-clean-stagefeedback-gold
+maybe-all-stagefeedback-gold:
+maybe-clean-stagefeedback-gold:
+@if gold-bootstrap
+maybe-all-stagefeedback-gold: all-stagefeedback-gold
+all-stagefeedback: all-stagefeedback-gold
+TARGET-stagefeedback-gold = $(TARGET-gold)
+all-stagefeedback-gold: configure-stagefeedback-gold
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -15720,76 +15855,88 @@ all-stagefeedback-libelf: configure-stagefeedback-libelf
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-libelf)
+               $(TARGET-stagefeedback-gold)
 
-maybe-clean-stagefeedback-libelf: clean-stagefeedback-libelf
-clean-stagefeedback: clean-stagefeedback-libelf
-clean-stagefeedback-libelf:
+maybe-clean-stagefeedback-gold: clean-stagefeedback-gold
+clean-stagefeedback: clean-stagefeedback-gold
+clean-stagefeedback-gold:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-gold/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
        $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libelf-bootstrap
+@endif gold-bootstrap
 
 
 
 
 
-.PHONY: check-libelf maybe-check-libelf
-maybe-check-libelf:
-@if libelf
-maybe-check-libelf: check-libelf
+.PHONY: check-gold maybe-check-gold
+maybe-check-gold:
+@if gold
+maybe-check-gold: check-gold
 
-check-libelf:
+check-gold:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libelf && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gold && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif libelf
+@endif gold
 
-.PHONY: install-libelf maybe-install-libelf
-maybe-install-libelf:
-@if libelf
-maybe-install-libelf: install-libelf
+.PHONY: install-gold maybe-install-gold
+maybe-install-gold:
+@if gold
+maybe-install-gold: install-gold
 
-install-libelf:
+install-gold: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gold && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif libelf
+@endif gold
 
-.PHONY: install-strip-libelf maybe-install-strip-libelf
-maybe-install-strip-libelf:
-@if libelf
-maybe-install-strip-libelf: install-strip-libelf
+.PHONY: install-strip-gold maybe-install-strip-gold
+maybe-install-strip-gold:
+@if gold
+maybe-install-strip-gold: install-strip-gold
 
-install-strip-libelf:
+install-strip-gold: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gold && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif libelf
+@endif gold
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-libelf info-libelf
-maybe-info-libelf:
-@if libelf
-maybe-info-libelf: info-libelf
+.PHONY: maybe-info-gold info-gold
+maybe-info-gold:
+@if gold
+maybe-info-gold: info-gold
 
-info-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+info-gold: \
+    configure-gold 
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing info in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15797,24 +15944,24 @@ info-libelf: \
                  info) \
          || exit 1
 
-@endif libelf
+@endif gold
 
-.PHONY: maybe-dvi-libelf dvi-libelf
-maybe-dvi-libelf:
-@if libelf
-maybe-dvi-libelf: dvi-libelf
+.PHONY: maybe-dvi-gold dvi-gold
+maybe-dvi-gold:
+@if gold
+maybe-dvi-gold: dvi-gold
 
-dvi-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+dvi-gold: \
+    configure-gold 
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing dvi in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15822,24 +15969,24 @@ dvi-libelf: \
                  dvi) \
          || exit 1
 
-@endif libelf
+@endif gold
 
-.PHONY: maybe-pdf-libelf pdf-libelf
-maybe-pdf-libelf:
-@if libelf
-maybe-pdf-libelf: pdf-libelf
+.PHONY: maybe-pdf-gold pdf-gold
+maybe-pdf-gold:
+@if gold
+maybe-pdf-gold: pdf-gold
 
-pdf-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+pdf-gold: \
+    configure-gold 
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing pdf in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15847,24 +15994,24 @@ pdf-libelf: \
                  pdf) \
          || exit 1
 
-@endif libelf
+@endif gold
 
-.PHONY: maybe-html-libelf html-libelf
-maybe-html-libelf:
-@if libelf
-maybe-html-libelf: html-libelf
+.PHONY: maybe-html-gold html-gold
+maybe-html-gold:
+@if gold
+maybe-html-gold: html-gold
 
-html-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+html-gold: \
+    configure-gold 
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing html in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15872,24 +16019,24 @@ html-libelf: \
                  html) \
          || exit 1
 
-@endif libelf
-
-.PHONY: maybe-TAGS-libelf TAGS-libelf
-maybe-TAGS-libelf:
-@if libelf
-maybe-TAGS-libelf: TAGS-libelf
+@endif gold
 
-TAGS-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+.PHONY: maybe-TAGS-gold TAGS-gold
+maybe-TAGS-gold:
+@if gold
+maybe-TAGS-gold: TAGS-gold
+
+TAGS-gold: \
+    configure-gold 
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing TAGS in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15897,25 +16044,25 @@ TAGS-libelf: \
                  TAGS) \
          || exit 1
 
-@endif libelf
+@endif gold
 
-.PHONY: maybe-install-info-libelf install-info-libelf
-maybe-install-info-libelf:
-@if libelf
-maybe-install-info-libelf: install-info-libelf
+.PHONY: maybe-install-info-gold install-info-gold
+maybe-install-info-gold:
+@if gold
+maybe-install-info-gold: install-info-gold
 
-install-info-libelf: \
-    configure-libelf \
-    info-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+install-info-gold: \
+    configure-gold \
+    info-gold 
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing install-info in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15923,25 +16070,25 @@ install-info-libelf: \
                  install-info) \
          || exit 1
 
-@endif libelf
+@endif gold
 
-.PHONY: maybe-install-pdf-libelf install-pdf-libelf
-maybe-install-pdf-libelf:
-@if libelf
-maybe-install-pdf-libelf: install-pdf-libelf
+.PHONY: maybe-install-pdf-gold install-pdf-gold
+maybe-install-pdf-gold:
+@if gold
+maybe-install-pdf-gold: install-pdf-gold
 
-install-pdf-libelf: \
-    configure-libelf \
-    pdf-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+install-pdf-gold: \
+    configure-gold \
+    pdf-gold 
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing install-pdf in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15949,25 +16096,25 @@ install-pdf-libelf: \
                  install-pdf) \
          || exit 1
 
-@endif libelf
+@endif gold
 
-.PHONY: maybe-install-html-libelf install-html-libelf
-maybe-install-html-libelf:
-@if libelf
-maybe-install-html-libelf: install-html-libelf
+.PHONY: maybe-install-html-gold install-html-gold
+maybe-install-html-gold:
+@if gold
+maybe-install-html-gold: install-html-gold
 
-install-html-libelf: \
-    configure-libelf \
-    html-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+install-html-gold: \
+    configure-gold \
+    html-gold 
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing install-html in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15975,24 +16122,24 @@ install-html-libelf: \
                  install-html) \
          || exit 1
 
-@endif libelf
+@endif gold
 
-.PHONY: maybe-installcheck-libelf installcheck-libelf
-maybe-installcheck-libelf:
-@if libelf
-maybe-installcheck-libelf: installcheck-libelf
+.PHONY: maybe-installcheck-gold installcheck-gold
+maybe-installcheck-gold:
+@if gold
+maybe-installcheck-gold: installcheck-gold
 
-installcheck-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+installcheck-gold: \
+    configure-gold 
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing installcheck in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16000,23 +16147,23 @@ installcheck-libelf: \
                  installcheck) \
          || exit 1
 
-@endif libelf
+@endif gold
 
-.PHONY: maybe-mostlyclean-libelf mostlyclean-libelf
-maybe-mostlyclean-libelf:
-@if libelf
-maybe-mostlyclean-libelf: mostlyclean-libelf
+.PHONY: maybe-mostlyclean-gold mostlyclean-gold
+maybe-mostlyclean-gold:
+@if gold
+maybe-mostlyclean-gold: mostlyclean-gold
 
-mostlyclean-libelf
-       @[ -f ./libelf/Makefile ] || exit 0; \
+mostlyclean-gold
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing mostlyclean in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16024,23 +16171,23 @@ mostlyclean-libelf:
                  mostlyclean) \
          || exit 1
 
-@endif libelf
+@endif gold
 
-.PHONY: maybe-clean-libelf clean-libelf
-maybe-clean-libelf:
-@if libelf
-maybe-clean-libelf: clean-libelf
+.PHONY: maybe-clean-gold clean-gold
+maybe-clean-gold:
+@if gold
+maybe-clean-gold: clean-gold
 
-clean-libelf
-       @[ -f ./libelf/Makefile ] || exit 0; \
+clean-gold
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing clean in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16048,23 +16195,23 @@ clean-libelf:
                  clean) \
          || exit 1
 
-@endif libelf
+@endif gold
 
-.PHONY: maybe-distclean-libelf distclean-libelf
-maybe-distclean-libelf:
-@if libelf
-maybe-distclean-libelf: distclean-libelf
+.PHONY: maybe-distclean-gold distclean-gold
+maybe-distclean-gold:
+@if gold
+maybe-distclean-gold: distclean-gold
 
-distclean-libelf
-       @[ -f ./libelf/Makefile ] || exit 0; \
+distclean-gold
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing distclean in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16072,23 +16219,23 @@ distclean-libelf:
                  distclean) \
          || exit 1
 
-@endif libelf
+@endif gold
 
-.PHONY: maybe-maintainer-clean-libelf maintainer-clean-libelf
-maybe-maintainer-clean-libelf:
-@if libelf
-maybe-maintainer-clean-libelf: maintainer-clean-libelf
+.PHONY: maybe-maintainer-clean-gold maintainer-clean-gold
+maybe-maintainer-clean-gold:
+@if gold
+maybe-maintainer-clean-gold: maintainer-clean-gold
 
-maintainer-clean-libelf
-       @[ -f ./libelf/Makefile ] || exit 0; \
+maintainer-clean-gold
+       @[ -f ./gold/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing maintainer-clean in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16096,574 +16243,129 @@ maintainer-clean-libelf:
                  maintainer-clean) \
          || exit 1
 
-@endif libelf
+@endif gold
 
 
 
-.PHONY: configure-gold maybe-configure-gold
-maybe-configure-gold:
+.PHONY: configure-gprof maybe-configure-gprof
+maybe-configure-gprof:
 @if gcc-bootstrap
-configure-gold: stage_current
+configure-gprof: stage_current
 @endif gcc-bootstrap
-@if gold
-maybe-configure-gold: configure-gold
-configure-gold: 
+@if gprof
+maybe-configure-gprof: configure-gprof
+configure-gprof: 
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+       test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gold; \
-       cd "$(HOST_SUBDIR)/gold" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gprof; \
+       cd "$(HOST_SUBDIR)/gprof" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=gold; \
+       module_srcdir=gprof; \
        $(SHELL) \
          $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif gold
-
-
-
-.PHONY: configure-stage1-gold maybe-configure-stage1-gold
-maybe-configure-stage1-gold:
-@if gold-bootstrap
-maybe-configure-stage1-gold: configure-stage1-gold
-configure-stage1-gold:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       module_srcdir=gold; \
-       $(SHELL) $$s/$$module_srcdir/configure \
-         --srcdir=$${topdir}/$$module_srcdir \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} \
-          \
-         $(STAGE1_CONFIGURE_FLAGS)
-@endif gold-bootstrap
+@endif gprof
 
-.PHONY: configure-stage2-gold maybe-configure-stage2-gold
-maybe-configure-stage2-gold:
-@if gold-bootstrap
-maybe-configure-stage2-gold: configure-stage2-gold
-configure-stage2-gold:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       module_srcdir=gold; \
-       $(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 gold-bootstrap
 
-.PHONY: configure-stage3-gold maybe-configure-stage3-gold
-maybe-configure-stage3-gold:
-@if gold-bootstrap
-maybe-configure-stage3-gold: configure-stage3-gold
-configure-stage3-gold:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       module_srcdir=gold; \
-       $(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 gold-bootstrap
 
-.PHONY: configure-stage4-gold maybe-configure-stage4-gold
-maybe-configure-stage4-gold:
-@if gold-bootstrap
-maybe-configure-stage4-gold: configure-stage4-gold
-configure-stage4-gold:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       module_srcdir=gold; \
-       $(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 gold-bootstrap
 
-.PHONY: configure-stageprofile-gold maybe-configure-stageprofile-gold
-maybe-configure-stageprofile-gold:
-@if gold-bootstrap
-maybe-configure-stageprofile-gold: configure-stageprofile-gold
-configure-stageprofile-gold:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       module_srcdir=gold; \
-       $(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 gold-bootstrap
 
-.PHONY: configure-stagefeedback-gold maybe-configure-stagefeedback-gold
-maybe-configure-stagefeedback-gold:
-@if gold-bootstrap
-maybe-configure-stagefeedback-gold: configure-stagefeedback-gold
-configure-stagefeedback-gold:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+.PHONY: all-gprof maybe-all-gprof
+maybe-all-gprof:
+@if gcc-bootstrap
+all-gprof: stage_current
+@endif gcc-bootstrap
+@if gprof
+TARGET-gprof=all
+maybe-all-gprof: all-gprof
+all-gprof: configure-gprof
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       module_srcdir=gold; \
-       $(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 gold-bootstrap
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gprof))
+@endif gprof
 
 
 
 
+.PHONY: check-gprof maybe-check-gprof
+maybe-check-gprof:
+@if gprof
+maybe-check-gprof: check-gprof
 
-.PHONY: all-gold maybe-all-gold
-maybe-all-gold:
-@if gcc-bootstrap
-all-gold: stage_current
-@endif gcc-bootstrap
-@if gold
-TARGET-gold=all
-maybe-all-gold: all-gold
-all-gold: configure-gold
+check-gprof:
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/gold && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-gold))
-@endif gold
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
+@endif gprof
 
+.PHONY: install-gprof maybe-install-gprof
+maybe-install-gprof:
+@if gprof
+maybe-install-gprof: install-gprof
 
-.PHONY: all-stage1-gold maybe-all-stage1-gold
-.PHONY: clean-stage1-gold maybe-clean-stage1-gold
-maybe-all-stage1-gold:
-maybe-clean-stage1-gold:
-@if gold-bootstrap
-maybe-all-stage1-gold: all-stage1-gold
-all-stage1: all-stage1-gold
-TARGET-stage1-gold = $(TARGET-gold)
-all-stage1-gold: configure-stage1-gold
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+install-gprof: installdirs
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" \
-               CXXFLAGS="$(STAGE1_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-gold)
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-maybe-clean-stage1-gold: clean-stage1-gold
-clean-stage1: clean-stage1-gold
-clean-stage1-gold:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-gold/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-       $(STAGE1_FLAGS_TO_PASS)  clean
-@endif gold-bootstrap
+@endif gprof
 
+.PHONY: install-strip-gprof maybe-install-strip-gprof
+maybe-install-strip-gprof:
+@if gprof
+maybe-install-strip-gprof: install-strip-gprof
 
-.PHONY: all-stage2-gold maybe-all-stage2-gold
-.PHONY: clean-stage2-gold maybe-clean-stage2-gold
-maybe-all-stage2-gold:
-maybe-clean-stage2-gold:
-@if gold-bootstrap
-maybe-all-stage2-gold: all-stage2-gold
-all-stage2: all-stage2-gold
-TARGET-stage2-gold = $(TARGET-gold)
-all-stage2-gold: configure-stage2-gold
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+install-strip-gprof: installdirs
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" \
-               CXXFLAGS="$(STAGE2_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-gold)
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-maybe-clean-stage2-gold: clean-stage2-gold
-clean-stage2: clean-stage2-gold
-clean-stage2-gold:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-gold/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif gold-bootstrap
+@endif gprof
 
+# Other targets (info, dvi, pdf, etc.)
 
-.PHONY: all-stage3-gold maybe-all-stage3-gold
-.PHONY: clean-stage3-gold maybe-clean-stage3-gold
-maybe-all-stage3-gold:
-maybe-clean-stage3-gold:
-@if gold-bootstrap
-maybe-all-stage3-gold: all-stage3-gold
-all-stage3: all-stage3-gold
-TARGET-stage3-gold = $(TARGET-gold)
-all-stage3-gold: configure-stage3-gold
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" \
-               CXXFLAGS="$(STAGE3_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-gold)
-
-maybe-clean-stage3-gold: clean-stage3-gold
-clean-stage3: clean-stage3-gold
-clean-stage3-gold:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage3-gold/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif gold-bootstrap
-
-
-.PHONY: all-stage4-gold maybe-all-stage4-gold
-.PHONY: clean-stage4-gold maybe-clean-stage4-gold
-maybe-all-stage4-gold:
-maybe-clean-stage4-gold:
-@if gold-bootstrap
-maybe-all-stage4-gold: all-stage4-gold
-all-stage4: all-stage4-gold
-TARGET-stage4-gold = $(TARGET-gold)
-all-stage4-gold: configure-stage4-gold
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" \
-               CXXFLAGS="$(STAGE4_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-gold)
-
-maybe-clean-stage4-gold: clean-stage4-gold
-clean-stage4: clean-stage4-gold
-clean-stage4-gold:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-gold/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif gold-bootstrap
-
-
-.PHONY: all-stageprofile-gold maybe-all-stageprofile-gold
-.PHONY: clean-stageprofile-gold maybe-clean-stageprofile-gold
-maybe-all-stageprofile-gold:
-maybe-clean-stageprofile-gold:
-@if gold-bootstrap
-maybe-all-stageprofile-gold: all-stageprofile-gold
-all-stageprofile: all-stageprofile-gold
-TARGET-stageprofile-gold = $(TARGET-gold)
-all-stageprofile-gold: configure-stageprofile-gold
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(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-gold)
-
-maybe-clean-stageprofile-gold: clean-stageprofile-gold
-clean-stageprofile: clean-stageprofile-gold
-clean-stageprofile-gold:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-gold/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif gold-bootstrap
-
-
-.PHONY: all-stagefeedback-gold maybe-all-stagefeedback-gold
-.PHONY: clean-stagefeedback-gold maybe-clean-stagefeedback-gold
-maybe-all-stagefeedback-gold:
-maybe-clean-stagefeedback-gold:
-@if gold-bootstrap
-maybe-all-stagefeedback-gold: all-stagefeedback-gold
-all-stagefeedback: all-stagefeedback-gold
-TARGET-stagefeedback-gold = $(TARGET-gold)
-all-stagefeedback-gold: configure-stagefeedback-gold
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(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-gold)
-
-maybe-clean-stagefeedback-gold: clean-stagefeedback-gold
-clean-stagefeedback: clean-stagefeedback-gold
-clean-stagefeedback-gold:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-gold/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif gold-bootstrap
-
-
-
-
-
-.PHONY: check-gold maybe-check-gold
-maybe-check-gold:
-@if gold
-maybe-check-gold: check-gold
-
-check-gold:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gold && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gold
-
-.PHONY: install-gold maybe-install-gold
-maybe-install-gold:
-@if gold
-maybe-install-gold: install-gold
-
-install-gold: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gold && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gold
-
-.PHONY: install-strip-gold maybe-install-strip-gold
-maybe-install-strip-gold:
-@if gold
-maybe-install-strip-gold: install-strip-gold
-
-install-strip-gold: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gold && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif gold
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-gold info-gold
-maybe-info-gold:
-@if gold
-maybe-info-gold: info-gold
-
-info-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: maybe-info-gprof info-gprof
+maybe-info-gprof:
+@if gprof
+maybe-info-gprof: info-gprof
+
+info-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing info in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16671,24 +16373,25 @@ info-gold: \
                  info) \
          || exit 1
 
-@endif gold
+@endif gprof
 
-.PHONY: maybe-dvi-gold dvi-gold
-maybe-dvi-gold:
-@if gold
-maybe-dvi-gold: dvi-gold
+.PHONY: maybe-dvi-gprof dvi-gprof
+maybe-dvi-gprof:
+@if gprof
+maybe-dvi-gprof: dvi-gprof
 
-dvi-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+dvi-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing dvi in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16696,24 +16399,25 @@ dvi-gold: \
                  dvi) \
          || exit 1
 
-@endif gold
+@endif gprof
 
-.PHONY: maybe-pdf-gold pdf-gold
-maybe-pdf-gold:
-@if gold
-maybe-pdf-gold: pdf-gold
+.PHONY: maybe-pdf-gprof pdf-gprof
+maybe-pdf-gprof:
+@if gprof
+maybe-pdf-gprof: pdf-gprof
 
-pdf-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+pdf-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing pdf in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16721,24 +16425,25 @@ pdf-gold: \
                  pdf) \
          || exit 1
 
-@endif gold
+@endif gprof
 
-.PHONY: maybe-html-gold html-gold
-maybe-html-gold:
-@if gold
-maybe-html-gold: html-gold
+.PHONY: maybe-html-gprof html-gprof
+maybe-html-gprof:
+@if gprof
+maybe-html-gprof: html-gprof
 
-html-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+html-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing html in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16746,24 +16451,25 @@ html-gold: \
                  html) \
          || exit 1
 
-@endif gold
+@endif gprof
 
-.PHONY: maybe-TAGS-gold TAGS-gold
-maybe-TAGS-gold:
-@if gold
-maybe-TAGS-gold: TAGS-gold
+.PHONY: maybe-TAGS-gprof TAGS-gprof
+maybe-TAGS-gprof:
+@if gprof
+maybe-TAGS-gprof: TAGS-gprof
 
-TAGS-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+TAGS-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing TAGS in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16771,25 +16477,26 @@ TAGS-gold: \
                  TAGS) \
          || exit 1
 
-@endif gold
+@endif gprof
 
-.PHONY: maybe-install-info-gold install-info-gold
-maybe-install-info-gold:
-@if gold
-maybe-install-info-gold: install-info-gold
+.PHONY: maybe-install-info-gprof install-info-gprof
+maybe-install-info-gprof:
+@if gprof
+maybe-install-info-gprof: install-info-gprof
 
-install-info-gold: \
-    configure-gold \
-    info-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+install-info-gprof: \
+    configure-gprof \
+    info-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing install-info in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16797,25 +16504,26 @@ install-info-gold: \
                  install-info) \
          || exit 1
 
-@endif gold
+@endif gprof
 
-.PHONY: maybe-install-pdf-gold install-pdf-gold
-maybe-install-pdf-gold:
-@if gold
-maybe-install-pdf-gold: install-pdf-gold
+.PHONY: maybe-install-pdf-gprof install-pdf-gprof
+maybe-install-pdf-gprof:
+@if gprof
+maybe-install-pdf-gprof: install-pdf-gprof
 
-install-pdf-gold: \
-    configure-gold \
-    pdf-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+install-pdf-gprof: \
+    configure-gprof \
+    pdf-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing install-pdf in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16823,25 +16531,26 @@ install-pdf-gold: \
                  install-pdf) \
          || exit 1
 
-@endif gold
+@endif gprof
 
-.PHONY: maybe-install-html-gold install-html-gold
-maybe-install-html-gold:
-@if gold
-maybe-install-html-gold: install-html-gold
+.PHONY: maybe-install-html-gprof install-html-gprof
+maybe-install-html-gprof:
+@if gprof
+maybe-install-html-gprof: install-html-gprof
 
-install-html-gold: \
-    configure-gold \
-    html-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+install-html-gprof: \
+    configure-gprof \
+    html-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing install-html in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16849,24 +16558,25 @@ install-html-gold: \
                  install-html) \
          || exit 1
 
-@endif gold
+@endif gprof
 
-.PHONY: maybe-installcheck-gold installcheck-gold
-maybe-installcheck-gold:
-@if gold
-maybe-installcheck-gold: installcheck-gold
+.PHONY: maybe-installcheck-gprof installcheck-gprof
+maybe-installcheck-gprof:
+@if gprof
+maybe-installcheck-gprof: installcheck-gprof
 
-installcheck-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+installcheck-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing installcheck in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16874,23 +16584,24 @@ installcheck-gold: \
                  installcheck) \
          || exit 1
 
-@endif gold
+@endif gprof
 
-.PHONY: maybe-mostlyclean-gold mostlyclean-gold
-maybe-mostlyclean-gold:
-@if gold
-maybe-mostlyclean-gold: mostlyclean-gold
+.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
+maybe-mostlyclean-gprof:
+@if gprof
+maybe-mostlyclean-gprof: mostlyclean-gprof
 
-mostlyclean-gold: 
-       @[ -f ./gold/Makefile ] || exit 0; \
+mostlyclean-gprof: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing mostlyclean in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16898,23 +16609,24 @@ mostlyclean-gold:
                  mostlyclean) \
          || exit 1
 
-@endif gold
+@endif gprof
 
-.PHONY: maybe-clean-gold clean-gold
-maybe-clean-gold:
-@if gold
-maybe-clean-gold: clean-gold
+.PHONY: maybe-clean-gprof clean-gprof
+maybe-clean-gprof:
+@if gprof
+maybe-clean-gprof: clean-gprof
 
-clean-gold: 
-       @[ -f ./gold/Makefile ] || exit 0; \
+clean-gprof: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing clean in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16922,23 +16634,24 @@ clean-gold:
                  clean) \
          || exit 1
 
-@endif gold
+@endif gprof
 
-.PHONY: maybe-distclean-gold distclean-gold
-maybe-distclean-gold:
-@if gold
-maybe-distclean-gold: distclean-gold
+.PHONY: maybe-distclean-gprof distclean-gprof
+maybe-distclean-gprof:
+@if gprof
+maybe-distclean-gprof: distclean-gprof
 
-distclean-gold: 
-       @[ -f ./gold/Makefile ] || exit 0; \
+distclean-gprof: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing distclean in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16946,23 +16659,24 @@ distclean-gold:
                  distclean) \
          || exit 1
 
-@endif gold
+@endif gprof
 
-.PHONY: maybe-maintainer-clean-gold maintainer-clean-gold
-maybe-maintainer-clean-gold:
-@if gold
-maybe-maintainer-clean-gold: maintainer-clean-gold
+.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
+maybe-maintainer-clean-gprof:
+@if gprof
+maybe-maintainer-clean-gprof: maintainer-clean-gprof
 
-maintainer-clean-gold: 
-       @[ -f ./gold/Makefile ] || exit 0; \
+maintainer-clean-gprof: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing maintainer-clean in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -16970,499 +16684,58 @@ maintainer-clean-gold:
                  maintainer-clean) \
          || exit 1
 
-@endif gold
+@endif gprof
 
 
 
-.PHONY: configure-gprof maybe-configure-gprof
-maybe-configure-gprof:
+.PHONY: configure-intl maybe-configure-intl
+maybe-configure-intl:
 @if gcc-bootstrap
-configure-gprof: stage_current
+configure-intl: stage_current
 @endif gcc-bootstrap
-@if gprof
-maybe-configure-gprof: configure-gprof
-configure-gprof: 
-       @: $(MAKE); $(unstage)
+@if intl
+maybe-configure-intl: configure-intl
+configure-intl: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
+       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gprof; \
-       cd "$(HOST_SUBDIR)/gprof" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/intl; \
+       cd "$(HOST_SUBDIR)/intl" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=gprof; \
+       module_srcdir=intl; \
        $(SHELL) \
          $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif gprof
-
-
-
-
-
-.PHONY: all-gprof maybe-all-gprof
-maybe-all-gprof:
-@if gcc-bootstrap
-all-gprof: stage_current
-@endif gcc-bootstrap
-@if gprof
-TARGET-gprof=all
-maybe-all-gprof: all-gprof
-all-gprof: configure-gprof
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-gprof))
-@endif gprof
-
-
+@endif intl
 
 
-.PHONY: check-gprof maybe-check-gprof
-maybe-check-gprof:
-@if gprof
-maybe-check-gprof: check-gprof
 
-check-gprof:
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage1-intl maybe-configure-stage1-intl
+maybe-configure-stage1-intl:
+@if intl-bootstrap
+maybe-configure-stage1-intl: configure-stage1-intl
+configure-stage1-intl:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gprof
-
-.PHONY: install-gprof maybe-install-gprof
-maybe-install-gprof:
-@if gprof
-maybe-install-gprof: install-gprof
-
-install-gprof: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gprof
-
-.PHONY: install-strip-gprof maybe-install-strip-gprof
-maybe-install-strip-gprof:
-@if gprof
-maybe-install-strip-gprof: install-strip-gprof
-
-install-strip-gprof: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif gprof
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-gprof info-gprof
-maybe-info-gprof:
-@if gprof
-maybe-info-gprof: info-gprof
-
-info-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-.PHONY: maybe-dvi-gprof dvi-gprof
-maybe-dvi-gprof:
-@if gprof
-maybe-dvi-gprof: dvi-gprof
-
-dvi-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-.PHONY: maybe-pdf-gprof pdf-gprof
-maybe-pdf-gprof:
-@if gprof
-maybe-pdf-gprof: pdf-gprof
-
-pdf-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-.PHONY: maybe-html-gprof html-gprof
-maybe-html-gprof:
-@if gprof
-maybe-html-gprof: html-gprof
-
-html-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-.PHONY: maybe-TAGS-gprof TAGS-gprof
-maybe-TAGS-gprof:
-@if gprof
-maybe-TAGS-gprof: TAGS-gprof
-
-TAGS-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-.PHONY: maybe-install-info-gprof install-info-gprof
-maybe-install-info-gprof:
-@if gprof
-maybe-install-info-gprof: install-info-gprof
-
-install-info-gprof: \
-    configure-gprof \
-    info-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-.PHONY: maybe-install-pdf-gprof install-pdf-gprof
-maybe-install-pdf-gprof:
-@if gprof
-maybe-install-pdf-gprof: install-pdf-gprof
-
-install-pdf-gprof: \
-    configure-gprof \
-    pdf-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-.PHONY: maybe-install-html-gprof install-html-gprof
-maybe-install-html-gprof:
-@if gprof
-maybe-install-html-gprof: install-html-gprof
-
-install-html-gprof: \
-    configure-gprof \
-    html-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-.PHONY: maybe-installcheck-gprof installcheck-gprof
-maybe-installcheck-gprof:
-@if gprof
-maybe-installcheck-gprof: installcheck-gprof
-
-installcheck-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
-maybe-mostlyclean-gprof:
-@if gprof
-maybe-mostlyclean-gprof: mostlyclean-gprof
-
-mostlyclean-gprof: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-.PHONY: maybe-clean-gprof clean-gprof
-maybe-clean-gprof:
-@if gprof
-maybe-clean-gprof: clean-gprof
-
-clean-gprof: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-.PHONY: maybe-distclean-gprof distclean-gprof
-maybe-distclean-gprof:
-@if gprof
-maybe-distclean-gprof: distclean-gprof
-
-distclean-gprof: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
-maybe-maintainer-clean-gprof:
-@if gprof
-maybe-maintainer-clean-gprof: maintainer-clean-gprof
-
-maintainer-clean-gprof: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(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 gprof
-
-
-
-.PHONY: configure-intl maybe-configure-intl
-maybe-configure-intl:
-@if gcc-bootstrap
-configure-intl: stage_current
-@endif gcc-bootstrap
-@if intl
-maybe-configure-intl: configure-intl
-configure-intl: 
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-       $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/intl; \
-       cd "$(HOST_SUBDIR)/intl" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       module_srcdir=intl; \
-       $(SHELL) \
-         $$s/$$module_srcdir/configure \
-         --srcdir=$${topdir}/$$module_srcdir \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias}  \
-         || exit 1
-@endif intl
-
-
-
-.PHONY: configure-stage1-intl maybe-configure-stage1-intl
-maybe-configure-stage1-intl:
-@if intl-bootstrap
-maybe-configure-stage1-intl: configure-stage1-intl
-configure-stage1-intl:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/intl/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)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/intl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
        cd $(HOST_SUBDIR)/intl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -17494,8 +16767,8 @@ configure-stage2-intl:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/intl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
        cd $(HOST_SUBDIR)/intl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -17507,7 +16780,7 @@ configure-stage2-intl:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
@@ -17527,8 +16800,8 @@ configure-stage3-intl:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/intl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
        cd $(HOST_SUBDIR)/intl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -17540,7 +16813,7 @@ configure-stage3-intl:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
@@ -17560,8 +16833,8 @@ configure-stage4-intl:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/intl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
        cd $(HOST_SUBDIR)/intl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -17573,7 +16846,7 @@ configure-stage4-intl:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
@@ -17593,8 +16866,8 @@ configure-stageprofile-intl:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/intl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
        cd $(HOST_SUBDIR)/intl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -17606,7 +16879,7 @@ configure-stageprofile-intl:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
@@ -17626,8 +16899,8 @@ configure-stagefeedback-intl:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/intl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
        cd $(HOST_SUBDIR)/intl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -17639,7 +16912,7 @@ configure-stagefeedback-intl:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
@@ -17925,9 +17198,9 @@ check-intl:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/intl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif intl
 
@@ -17977,7 +17250,7 @@ info-intl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in intl" ; \
+       echo "Doing info in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18002,7 +17275,7 @@ dvi-intl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in intl" ; \
+       echo "Doing dvi in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18027,7 +17300,7 @@ pdf-intl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in intl" ; \
+       echo "Doing pdf in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18052,7 +17325,7 @@ html-intl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in intl" ; \
+       echo "Doing html in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18077,7 +17350,7 @@ TAGS-intl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in intl" ; \
+       echo "Doing TAGS in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18103,7 +17376,7 @@ install-info-intl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in intl" ; \
+       echo "Doing install-info in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18129,7 +17402,7 @@ install-pdf-intl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in intl" ; \
+       echo "Doing install-pdf in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18155,7 +17428,7 @@ install-html-intl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in intl" ; \
+       echo "Doing install-html in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18180,7 +17453,7 @@ installcheck-intl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in intl" ; \
+       echo "Doing installcheck in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18204,7 +17477,7 @@ mostlyclean-intl:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in intl" ; \
+       echo "Doing mostlyclean in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18228,7 +17501,7 @@ clean-intl:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in intl" ; \
+       echo "Doing clean in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18252,7 +17525,7 @@ distclean-intl:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in intl" ; \
+       echo "Doing distclean in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18276,7 +17549,7 @@ maintainer-clean-intl:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in intl" ; \
+       echo "Doing maintainer-clean in intl"; \
        (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18301,7 +17574,7 @@ configure-tcl:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/tcl; \
        cd "$(HOST_SUBDIR)/tcl" || exit 1; \
@@ -18353,7 +17626,7 @@ check-tcl:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -18406,7 +17679,7 @@ info-tcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in tcl" ; \
+       echo "Doing info in tcl"; \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18432,7 +17705,7 @@ dvi-tcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in tcl" ; \
+       echo "Doing dvi in tcl"; \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18458,7 +17731,7 @@ pdf-tcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in tcl" ; \
+       echo "Doing pdf in tcl"; \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18484,7 +17757,7 @@ html-tcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in tcl" ; \
+       echo "Doing html in tcl"; \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18510,7 +17783,7 @@ TAGS-tcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in tcl" ; \
+       echo "Doing TAGS in tcl"; \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18537,7 +17810,7 @@ install-info-tcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in tcl" ; \
+       echo "Doing install-info in tcl"; \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18564,7 +17837,7 @@ install-pdf-tcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in tcl" ; \
+       echo "Doing install-pdf in tcl"; \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18591,7 +17864,7 @@ install-html-tcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in tcl" ; \
+       echo "Doing install-html in tcl"; \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18617,7 +17890,7 @@ installcheck-tcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in tcl" ; \
+       echo "Doing installcheck in tcl"; \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18652,7 +17925,7 @@ clean-tcl:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in tcl" ; \
+       echo "Doing clean in tcl"; \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18677,7 +17950,7 @@ distclean-tcl:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in tcl" ; \
+       echo "Doing distclean in tcl"; \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18702,7 +17975,7 @@ maintainer-clean-tcl:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in tcl" ; \
+       echo "Doing maintainer-clean in tcl"; \
        (cd $(HOST_SUBDIR)/tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18727,7 +18000,7 @@ configure-itcl:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/itcl; \
        cd "$(HOST_SUBDIR)/itcl" || exit 1; \
@@ -18779,7 +18052,7 @@ check-itcl:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -18832,7 +18105,7 @@ info-itcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in itcl" ; \
+       echo "Doing info in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18858,7 +18131,7 @@ dvi-itcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in itcl" ; \
+       echo "Doing dvi in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18884,7 +18157,7 @@ pdf-itcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in itcl" ; \
+       echo "Doing pdf in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18910,7 +18183,7 @@ html-itcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in itcl" ; \
+       echo "Doing html in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18936,7 +18209,7 @@ TAGS-itcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in itcl" ; \
+       echo "Doing TAGS in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18963,7 +18236,7 @@ install-info-itcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in itcl" ; \
+       echo "Doing install-info in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -18990,7 +18263,7 @@ install-pdf-itcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in itcl" ; \
+       echo "Doing install-pdf in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19017,7 +18290,7 @@ install-html-itcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in itcl" ; \
+       echo "Doing install-html in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19043,7 +18316,7 @@ installcheck-itcl: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in itcl" ; \
+       echo "Doing installcheck in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19068,7 +18341,7 @@ mostlyclean-itcl:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in itcl" ; \
+       echo "Doing mostlyclean in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19093,7 +18366,7 @@ clean-itcl:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in itcl" ; \
+       echo "Doing clean in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19118,7 +18391,7 @@ distclean-itcl:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in itcl" ; \
+       echo "Doing distclean in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19143,7 +18416,7 @@ maintainer-clean-itcl:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in itcl" ; \
+       echo "Doing maintainer-clean in itcl"; \
        (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19167,7 +18440,7 @@ configure-ld:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/ld; \
        cd "$(HOST_SUBDIR)/ld" || exit 1; \
@@ -19202,8 +18475,8 @@ configure-stage1-ld:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/ld; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \
        cd $(HOST_SUBDIR)/ld || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -19235,8 +18508,8 @@ configure-stage2-ld:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/ld; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \
        cd $(HOST_SUBDIR)/ld || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -19248,7 +18521,7 @@ configure-stage2-ld:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
@@ -19268,8 +18541,8 @@ configure-stage3-ld:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/ld; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \
        cd $(HOST_SUBDIR)/ld || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -19281,7 +18554,7 @@ configure-stage3-ld:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
@@ -19301,8 +18574,8 @@ configure-stage4-ld:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/ld; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \
        cd $(HOST_SUBDIR)/ld || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -19314,7 +18587,7 @@ configure-stage4-ld:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
@@ -19334,8 +18607,8 @@ configure-stageprofile-ld:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/ld; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \
        cd $(HOST_SUBDIR)/ld || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -19347,7 +18620,7 @@ configure-stageprofile-ld:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
@@ -19367,8 +18640,8 @@ configure-stagefeedback-ld:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/ld; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \
        cd $(HOST_SUBDIR)/ld || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -19380,7 +18653,7 @@ configure-stagefeedback-ld:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
@@ -19666,9 +18939,9 @@ check-ld:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/ld && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif ld
 
@@ -19718,7 +18991,7 @@ info-ld: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in ld" ; \
+       echo "Doing info in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19743,7 +19016,7 @@ dvi-ld: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in ld" ; \
+       echo "Doing dvi in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19768,7 +19041,7 @@ pdf-ld: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in ld" ; \
+       echo "Doing pdf in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19793,7 +19066,7 @@ html-ld: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in ld" ; \
+       echo "Doing html in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19818,7 +19091,7 @@ TAGS-ld: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in ld" ; \
+       echo "Doing TAGS in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19844,7 +19117,7 @@ install-info-ld: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in ld" ; \
+       echo "Doing install-info in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19870,7 +19143,7 @@ install-pdf-ld: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in ld" ; \
+       echo "Doing install-pdf in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19896,7 +19169,7 @@ install-html-ld: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in ld" ; \
+       echo "Doing install-html in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19921,7 +19194,7 @@ installcheck-ld: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in ld" ; \
+       echo "Doing installcheck in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19945,7 +19218,7 @@ mostlyclean-ld:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in ld" ; \
+       echo "Doing mostlyclean in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19969,7 +19242,7 @@ clean-ld:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in ld" ; \
+       echo "Doing clean in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -19993,7 +19266,7 @@ distclean-ld:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in ld" ; \
+       echo "Doing distclean in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -20017,7 +19290,7 @@ maintainer-clean-ld:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in ld" ; \
+       echo "Doing maintainer-clean in ld"; \
        (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -20041,7 +19314,7 @@ configure-libbacktrace:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/libbacktrace; \
        cd "$(HOST_SUBDIR)/libbacktrace" || exit 1; \
@@ -20076,8 +19349,8 @@ configure-stage1-libbacktrace:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/libbacktrace ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       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) ;; \
@@ -20109,8 +19382,8 @@ configure-stage2-libbacktrace:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/libbacktrace ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       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) ;; \
@@ -20122,7 +19395,7 @@ configure-stage2-libbacktrace:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif libbacktrace-bootstrap
 
@@ -20142,8 +19415,8 @@ configure-stage3-libbacktrace:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/libbacktrace ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       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) ;; \
@@ -20155,7 +19428,7 @@ configure-stage3-libbacktrace:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif libbacktrace-bootstrap
 
@@ -20175,8 +19448,8 @@ configure-stage4-libbacktrace:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/libbacktrace ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       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) ;; \
@@ -20188,7 +19461,7 @@ configure-stage4-libbacktrace:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif libbacktrace-bootstrap
 
@@ -20208,8 +19481,8 @@ configure-stageprofile-libbacktrace:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/libbacktrace ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       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) ;; \
@@ -20221,7 +19494,7 @@ configure-stageprofile-libbacktrace:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif libbacktrace-bootstrap
 
@@ -20241,8 +19514,8 @@ configure-stagefeedback-libbacktrace:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/libbacktrace ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \
+       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) ;; \
@@ -20254,7 +19527,7 @@ configure-stagefeedback-libbacktrace:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif libbacktrace-bootstrap
 
@@ -20540,9 +19813,9 @@ check-libbacktrace:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/libbacktrace && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif libbacktrace
 
@@ -20592,7 +19865,7 @@ info-libbacktrace: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libbacktrace" ; \
+       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}" \
@@ -20617,7 +19890,7 @@ dvi-libbacktrace: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libbacktrace" ; \
+       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}" \
@@ -20642,7 +19915,7 @@ pdf-libbacktrace: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libbacktrace" ; \
+       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}" \
@@ -20667,7 +19940,7 @@ html-libbacktrace: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libbacktrace" ; \
+       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}" \
@@ -20692,7 +19965,7 @@ TAGS-libbacktrace: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libbacktrace" ; \
+       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}" \
@@ -20718,7 +19991,7 @@ install-info-libbacktrace: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libbacktrace" ; \
+       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}" \
@@ -20744,7 +20017,7 @@ install-pdf-libbacktrace: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in libbacktrace" ; \
+       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}" \
@@ -20770,7 +20043,7 @@ install-html-libbacktrace: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in libbacktrace" ; \
+       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}" \
@@ -20795,7 +20068,7 @@ installcheck-libbacktrace: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libbacktrace" ; \
+       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}" \
@@ -20819,7 +20092,7 @@ mostlyclean-libbacktrace:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libbacktrace" ; \
+       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}" \
@@ -20843,7 +20116,7 @@ clean-libbacktrace:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libbacktrace" ; \
+       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}" \
@@ -20867,7 +20140,7 @@ distclean-libbacktrace:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libbacktrace" ; \
+       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}" \
@@ -20891,7 +20164,7 @@ maintainer-clean-libbacktrace:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libbacktrace" ; \
+       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}" \
@@ -20915,7 +20188,7 @@ configure-libcpp:
        @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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/libcpp; \
        cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
@@ -20950,8 +20223,8 @@ configure-stage1-libcpp:
        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 ; \
+       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) ;; \
@@ -20983,8 +20256,8 @@ configure-stage2-libcpp:
        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 ; \
+       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) ;; \
@@ -20996,7 +20269,7 @@ configure-stage2-libcpp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
@@ -21016,8 +20289,8 @@ configure-stage3-libcpp:
        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 ; \
+       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) ;; \
@@ -21029,7 +20302,7 @@ configure-stage3-libcpp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
@@ -21049,8 +20322,8 @@ configure-stage4-libcpp:
        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 ; \
+       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) ;; \
@@ -21062,7 +20335,7 @@ configure-stage4-libcpp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
@@ -21082,8 +20355,8 @@ configure-stageprofile-libcpp:
        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 ; \
+       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) ;; \
@@ -21095,7 +20368,7 @@ configure-stageprofile-libcpp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
@@ -21115,8 +20388,8 @@ configure-stagefeedback-libcpp:
        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 ; \
+       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) ;; \
@@ -21128,7 +20401,7 @@ configure-stagefeedback-libcpp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
@@ -21414,9 +20687,9 @@ check-libcpp:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/libcpp && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif libcpp
 
@@ -21466,7 +20739,7 @@ info-libcpp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libcpp" ; \
+       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}" \
@@ -21491,7 +20764,7 @@ dvi-libcpp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libcpp" ; \
+       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}" \
@@ -21516,7 +20789,7 @@ pdf-libcpp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libcpp" ; \
+       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}" \
@@ -21541,7 +20814,7 @@ html-libcpp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libcpp" ; \
+       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}" \
@@ -21566,7 +20839,7 @@ TAGS-libcpp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libcpp" ; \
+       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}" \
@@ -21592,7 +20865,7 @@ install-info-libcpp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libcpp" ; \
+       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}" \
@@ -21618,7 +20891,7 @@ install-pdf-libcpp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in libcpp" ; \
+       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}" \
@@ -21644,7 +20917,7 @@ install-html-libcpp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in libcpp" ; \
+       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}" \
@@ -21669,7 +20942,7 @@ installcheck-libcpp: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libcpp" ; \
+       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}" \
@@ -21693,7 +20966,7 @@ mostlyclean-libcpp:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libcpp" ; \
+       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}" \
@@ -21717,7 +20990,7 @@ clean-libcpp:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libcpp" ; \
+       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}" \
@@ -21741,7 +21014,7 @@ distclean-libcpp:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libcpp" ; \
+       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}" \
@@ -21765,7 +21038,7 @@ maintainer-clean-libcpp:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libcpp" ; \
+       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}" \
@@ -21789,7 +21062,7 @@ configure-libdecnumber:
        @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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
        cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
@@ -21824,8 +21097,8 @@ configure-stage1-libdecnumber:
        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 ; \
+       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) ;; \
@@ -21857,8 +21130,8 @@ configure-stage2-libdecnumber:
        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 ; \
+       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) ;; \
@@ -21870,7 +21143,7 @@ configure-stage2-libdecnumber:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
@@ -21890,8 +21163,8 @@ configure-stage3-libdecnumber:
        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 ; \
+       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) ;; \
@@ -21903,7 +21176,7 @@ configure-stage3-libdecnumber:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
@@ -21923,8 +21196,8 @@ configure-stage4-libdecnumber:
        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 ; \
+       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) ;; \
@@ -21936,7 +21209,7 @@ configure-stage4-libdecnumber:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
@@ -21956,8 +21229,8 @@ configure-stageprofile-libdecnumber:
        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 ; \
+       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) ;; \
@@ -21969,7 +21242,7 @@ configure-stageprofile-libdecnumber:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
@@ -21989,8 +21262,8 @@ configure-stagefeedback-libdecnumber:
        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 ; \
+       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) ;; \
@@ -22002,7 +21275,7 @@ configure-stagefeedback-libdecnumber:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
@@ -22288,9 +21561,9 @@ check-libdecnumber:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/libdecnumber && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif libdecnumber
 
@@ -22340,7 +21613,7 @@ info-libdecnumber: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libdecnumber" ; \
+       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}" \
@@ -22365,7 +21638,7 @@ dvi-libdecnumber: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libdecnumber" ; \
+       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}" \
@@ -22390,7 +21663,7 @@ pdf-libdecnumber: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libdecnumber" ; \
+       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}" \
@@ -22415,7 +21688,7 @@ html-libdecnumber: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libdecnumber" ; \
+       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}" \
@@ -22440,7 +21713,7 @@ TAGS-libdecnumber: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libdecnumber" ; \
+       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}" \
@@ -22466,7 +21739,7 @@ install-info-libdecnumber: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libdecnumber" ; \
+       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}" \
@@ -22492,7 +21765,7 @@ install-pdf-libdecnumber: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in libdecnumber" ; \
+       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}" \
@@ -22518,7 +21791,7 @@ install-html-libdecnumber: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in libdecnumber" ; \
+       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}" \
@@ -22543,7 +21816,7 @@ installcheck-libdecnumber: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libdecnumber" ; \
+       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}" \
@@ -22567,7 +21840,7 @@ mostlyclean-libdecnumber:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libdecnumber" ; \
+       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}" \
@@ -22591,7 +21864,7 @@ clean-libdecnumber:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libdecnumber" ; \
+       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}" \
@@ -22615,7 +21888,7 @@ distclean-libdecnumber:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libdecnumber" ; \
+       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}" \
@@ -22639,7 +21912,7 @@ maintainer-clean-libdecnumber:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libdecnumber" ; \
+       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}" \
@@ -22664,7 +21937,7 @@ configure-libgui:
        @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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/libgui; \
        cd "$(HOST_SUBDIR)/libgui" || exit 1; \
@@ -22716,7 +21989,7 @@ check-libgui:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -22769,7 +22042,7 @@ info-libgui: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libgui" ; \
+       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}" \
@@ -22795,7 +22068,7 @@ dvi-libgui: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libgui" ; \
+       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}" \
@@ -22821,7 +22094,7 @@ pdf-libgui: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libgui" ; \
+       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}" \
@@ -22847,7 +22120,7 @@ html-libgui: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libgui" ; \
+       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}" \
@@ -22873,7 +22146,7 @@ TAGS-libgui: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libgui" ; \
+       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}" \
@@ -22900,7 +22173,7 @@ install-info-libgui: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libgui" ; \
+       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}" \
@@ -22927,7 +22200,7 @@ install-pdf-libgui: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in libgui" ; \
+       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}" \
@@ -22954,7 +22227,7 @@ install-html-libgui: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in libgui" ; \
+       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}" \
@@ -22980,7 +22253,7 @@ installcheck-libgui: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libgui" ; \
+       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}" \
@@ -23005,7 +22278,7 @@ mostlyclean-libgui:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libgui" ; \
+       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}" \
@@ -23030,7 +22303,7 @@ clean-libgui:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libgui" ; \
+       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}" \
@@ -23055,7 +22328,7 @@ distclean-libgui:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libgui" ; \
+       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}" \
@@ -23080,7 +22353,7 @@ maintainer-clean-libgui:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libgui" ; \
+       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}" \
@@ -23104,7 +22377,7 @@ 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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/libiberty; \
        cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
@@ -23139,8 +22412,8 @@ configure-stage1-libiberty:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \
        cd $(HOST_SUBDIR)/libiberty || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -23173,8 +22446,8 @@ configure-stage2-libiberty:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \
        cd $(HOST_SUBDIR)/libiberty || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -23186,7 +22459,7 @@ configure-stage2-libiberty:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS) \
          @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
@@ -23207,8 +22480,8 @@ configure-stage3-libiberty:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \
        cd $(HOST_SUBDIR)/libiberty || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -23220,7 +22493,7 @@ configure-stage3-libiberty:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS) \
          @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
@@ -23241,8 +22514,8 @@ configure-stage4-libiberty:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \
        cd $(HOST_SUBDIR)/libiberty || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -23254,7 +22527,7 @@ configure-stage4-libiberty:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS) \
          @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
@@ -23275,8 +22548,8 @@ configure-stageprofile-libiberty:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libiberty; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \
        cd $(HOST_SUBDIR)/libiberty || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -23288,7 +22561,7 @@ configure-stageprofile-libiberty:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS) \
          @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
@@ -23309,8 +22582,8 @@ configure-stagefeedback-libiberty:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \
        cd $(HOST_SUBDIR)/libiberty || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -23322,7 +22595,7 @@ configure-stagefeedback-libiberty:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
          @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
@@ -23609,9 +22882,9 @@ check-libiberty:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/libiberty && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif libiberty
 
@@ -23661,7 +22934,7 @@ info-libiberty: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libiberty" ; \
+       echo "Doing info in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23686,7 +22959,7 @@ dvi-libiberty: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libiberty" ; \
+       echo "Doing dvi in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23711,7 +22984,7 @@ pdf-libiberty: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libiberty" ; \
+       echo "Doing pdf in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23736,7 +23009,7 @@ html-libiberty: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libiberty" ; \
+       echo "Doing html in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23761,7 +23034,7 @@ TAGS-libiberty: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libiberty" ; \
+       echo "Doing TAGS in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23787,7 +23060,7 @@ install-info-libiberty: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libiberty" ; \
+       echo "Doing install-info in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23813,7 +23086,7 @@ install-pdf-libiberty: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in libiberty" ; \
+       echo "Doing install-pdf in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23839,7 +23112,7 @@ install-html-libiberty: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in libiberty" ; \
+       echo "Doing install-html in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23864,7 +23137,7 @@ installcheck-libiberty: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libiberty" ; \
+       echo "Doing installcheck in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23888,7 +23161,7 @@ mostlyclean-libiberty:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libiberty" ; \
+       echo "Doing mostlyclean in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23912,7 +23185,7 @@ clean-libiberty:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libiberty" ; \
+       echo "Doing clean in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23936,7 +23209,7 @@ distclean-libiberty:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libiberty" ; \
+       echo "Doing distclean in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23960,7 +23233,7 @@ maintainer-clean-libiberty:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libiberty" ; \
+       echo "Doing maintainer-clean in libiberty"; \
        (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -23984,7 +23257,7 @@ 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 ; \
+       $(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; \
@@ -24019,8 +23292,8 @@ configure-stage1-libiberty-linker-plugin:
        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 ; \
+       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) ;; \
@@ -24053,8 +23326,8 @@ configure-stage2-libiberty-linker-plugin:
        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 ; \
+       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) ;; \
@@ -24066,7 +23339,7 @@ configure-stage2-libiberty-linker-plugin:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --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
@@ -24087,8 +23360,8 @@ configure-stage3-libiberty-linker-plugin:
        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 ; \
+       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) ;; \
@@ -24100,7 +23373,7 @@ configure-stage3-libiberty-linker-plugin:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --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
@@ -24121,8 +23394,8 @@ configure-stage4-libiberty-linker-plugin:
        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 ; \
+       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) ;; \
@@ -24134,7 +23407,7 @@ configure-stage4-libiberty-linker-plugin:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --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
@@ -24155,8 +23428,8 @@ configure-stageprofile-libiberty-linker-plugin:
        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 ; \
+       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) ;; \
@@ -24168,7 +23441,7 @@ configure-stageprofile-libiberty-linker-plugin:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --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
@@ -24189,8 +23462,8 @@ configure-stagefeedback-libiberty-linker-plugin:
        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 ; \
+       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) ;; \
@@ -24202,7 +23475,7 @@ configure-stagefeedback-libiberty-linker-plugin:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --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
@@ -24489,9 +23762,9 @@ check-libiberty-linker-plugin:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
-         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ check)
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif libiberty-linker-plugin
 
@@ -24541,7 +23814,7 @@ info-libiberty-linker-plugin: \
        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" ; \
+       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}" \
@@ -24566,7 +23839,7 @@ dvi-libiberty-linker-plugin: \
        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" ; \
+       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}" \
@@ -24591,7 +23864,7 @@ pdf-libiberty-linker-plugin: \
        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" ; \
+       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}" \
@@ -24616,7 +23889,7 @@ html-libiberty-linker-plugin: \
        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" ; \
+       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}" \
@@ -24641,7 +23914,7 @@ TAGS-libiberty-linker-plugin: \
        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" ; \
+       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}" \
@@ -24667,7 +23940,7 @@ install-info-libiberty-linker-plugin: \
        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" ; \
+       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}" \
@@ -24693,7 +23966,7 @@ install-pdf-libiberty-linker-plugin: \
        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" ; \
+       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}" \
@@ -24719,7 +23992,7 @@ install-html-libiberty-linker-plugin: \
        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" ; \
+       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}" \
@@ -24744,7 +24017,7 @@ installcheck-libiberty-linker-plugin: \
        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" ; \
+       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}" \
@@ -24768,7 +24041,7 @@ mostlyclean-libiberty-linker-plugin:
        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" ; \
+       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}" \
@@ -24792,7 +24065,7 @@ clean-libiberty-linker-plugin:
        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" ; \
+       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}" \
@@ -24816,7 +24089,7 @@ distclean-libiberty-linker-plugin:
        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" ; \
+       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}" \
@@ -24840,7 +24113,7 @@ maintainer-clean-libiberty-linker-plugin:
        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" ; \
+       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}" \
@@ -24865,7 +24138,7 @@ configure-libiconv:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/libiconv; \
        cd "$(HOST_SUBDIR)/libiconv" || exit 1; \
@@ -24917,7 +24190,7 @@ check-libiconv:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -24958,7 +24231,7 @@ info-libiconv: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libiconv" ; \
+       echo "Doing info in libiconv"; \
        (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -24984,7 +24257,7 @@ dvi-libiconv: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libiconv" ; \
+       echo "Doing dvi in libiconv"; \
        (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25010,7 +24283,7 @@ pdf-libiconv: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libiconv" ; \
+       echo "Doing pdf in libiconv"; \
        (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25036,7 +24309,7 @@ html-libiconv: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libiconv" ; \
+       echo "Doing html in libiconv"; \
        (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25062,7 +24335,7 @@ TAGS-libiconv: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libiconv" ; \
+       echo "Doing TAGS in libiconv"; \
        (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25118,7 +24391,7 @@ installcheck-libiconv: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libiconv" ; \
+       echo "Doing installcheck in libiconv"; \
        (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25143,7 +24416,7 @@ mostlyclean-libiconv:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libiconv" ; \
+       echo "Doing mostlyclean in libiconv"; \
        (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25168,7 +24441,7 @@ clean-libiconv:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libiconv" ; \
+       echo "Doing clean in libiconv"; \
        (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25193,7 +24466,7 @@ distclean-libiconv:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libiconv" ; \
+       echo "Doing distclean in libiconv"; \
        (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25218,7 +24491,7 @@ maintainer-clean-libiconv:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libiconv" ; \
+       echo "Doing maintainer-clean in libiconv"; \
        (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25243,7 +24516,7 @@ configure-m4:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/m4; \
        cd "$(HOST_SUBDIR)/m4" || exit 1; \
@@ -25295,7 +24568,7 @@ check-m4:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -25348,7 +24621,7 @@ info-m4: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in m4" ; \
+       echo "Doing info in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25374,7 +24647,7 @@ dvi-m4: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in m4" ; \
+       echo "Doing dvi in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25400,7 +24673,7 @@ pdf-m4: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in m4" ; \
+       echo "Doing pdf in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25426,7 +24699,7 @@ html-m4: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in m4" ; \
+       echo "Doing html in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25452,7 +24725,7 @@ TAGS-m4: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in m4" ; \
+       echo "Doing TAGS in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25479,7 +24752,7 @@ install-info-m4: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in m4" ; \
+       echo "Doing install-info in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25506,7 +24779,7 @@ install-pdf-m4: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in m4" ; \
+       echo "Doing install-pdf in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25533,7 +24806,7 @@ install-html-m4: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in m4" ; \
+       echo "Doing install-html in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25559,7 +24832,7 @@ installcheck-m4: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in m4" ; \
+       echo "Doing installcheck in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25584,7 +24857,7 @@ mostlyclean-m4:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in m4" ; \
+       echo "Doing mostlyclean in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25609,7 +24882,7 @@ clean-m4:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in m4" ; \
+       echo "Doing clean in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25634,7 +24907,7 @@ distclean-m4:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in m4" ; \
+       echo "Doing distclean in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25659,7 +24932,7 @@ maintainer-clean-m4:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in m4" ; \
+       echo "Doing maintainer-clean in m4"; \
        (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25684,7 +24957,7 @@ configure-readline:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/readline; \
        cd "$(HOST_SUBDIR)/readline" || exit 1; \
@@ -25736,7 +25009,7 @@ check-readline:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -25789,7 +25062,7 @@ info-readline: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in readline" ; \
+       echo "Doing info in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25815,7 +25088,7 @@ dvi-readline: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in readline" ; \
+       echo "Doing dvi in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25841,7 +25114,7 @@ pdf-readline: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in readline" ; \
+       echo "Doing pdf in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25867,7 +25140,7 @@ html-readline: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in readline" ; \
+       echo "Doing html in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25893,7 +25166,7 @@ TAGS-readline: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in readline" ; \
+       echo "Doing TAGS in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25920,7 +25193,7 @@ install-info-readline: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in readline" ; \
+       echo "Doing install-info in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25947,7 +25220,7 @@ install-pdf-readline: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in readline" ; \
+       echo "Doing install-pdf in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -25974,7 +25247,7 @@ install-html-readline: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in readline" ; \
+       echo "Doing install-html in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26000,7 +25273,7 @@ installcheck-readline: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in readline" ; \
+       echo "Doing installcheck in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26025,7 +25298,7 @@ mostlyclean-readline:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in readline" ; \
+       echo "Doing mostlyclean in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26050,7 +25323,7 @@ clean-readline:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in readline" ; \
+       echo "Doing clean in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26075,7 +25348,7 @@ distclean-readline:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in readline" ; \
+       echo "Doing distclean in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26100,7 +25373,7 @@ maintainer-clean-readline:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in readline" ; \
+       echo "Doing maintainer-clean in readline"; \
        (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26125,7 +25398,7 @@ configure-sid:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/sid; \
        cd "$(HOST_SUBDIR)/sid" || exit 1; \
@@ -26177,7 +25450,7 @@ check-sid:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -26230,7 +25503,7 @@ info-sid: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in sid" ; \
+       echo "Doing info in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26256,7 +25529,7 @@ dvi-sid: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in sid" ; \
+       echo "Doing dvi in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26282,7 +25555,7 @@ pdf-sid: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in sid" ; \
+       echo "Doing pdf in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26308,7 +25581,7 @@ html-sid: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in sid" ; \
+       echo "Doing html in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26334,7 +25607,7 @@ TAGS-sid: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in sid" ; \
+       echo "Doing TAGS in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26361,7 +25634,7 @@ install-info-sid: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in sid" ; \
+       echo "Doing install-info in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26388,7 +25661,7 @@ install-pdf-sid: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in sid" ; \
+       echo "Doing install-pdf in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26415,7 +25688,7 @@ install-html-sid: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in sid" ; \
+       echo "Doing install-html in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26441,7 +25714,7 @@ installcheck-sid: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in sid" ; \
+       echo "Doing installcheck in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26466,7 +25739,7 @@ mostlyclean-sid:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in sid" ; \
+       echo "Doing mostlyclean in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26491,7 +25764,7 @@ clean-sid:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in sid" ; \
+       echo "Doing clean in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26516,7 +25789,7 @@ distclean-sid:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in sid" ; \
+       echo "Doing distclean in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26541,7 +25814,7 @@ maintainer-clean-sid:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in sid" ; \
+       echo "Doing maintainer-clean in sid"; \
        (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26566,7 +25839,7 @@ configure-sim:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/sim; \
        cd "$(HOST_SUBDIR)/sim" || exit 1; \
@@ -26618,7 +25891,7 @@ check-sim:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -26671,7 +25944,7 @@ info-sim: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in sim" ; \
+       echo "Doing info in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26697,7 +25970,7 @@ dvi-sim: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in sim" ; \
+       echo "Doing dvi in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26723,7 +25996,7 @@ pdf-sim: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in sim" ; \
+       echo "Doing pdf in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26749,7 +26022,7 @@ html-sim: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in sim" ; \
+       echo "Doing html in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26775,7 +26048,7 @@ TAGS-sim: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in sim" ; \
+       echo "Doing TAGS in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26802,7 +26075,7 @@ install-info-sim: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in sim" ; \
+       echo "Doing install-info in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26829,7 +26102,7 @@ install-pdf-sim: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in sim" ; \
+       echo "Doing install-pdf in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26856,7 +26129,7 @@ install-html-sim: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in sim" ; \
+       echo "Doing install-html in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26882,7 +26155,7 @@ installcheck-sim: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in sim" ; \
+       echo "Doing installcheck in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26907,7 +26180,7 @@ mostlyclean-sim:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in sim" ; \
+       echo "Doing mostlyclean in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26932,7 +26205,7 @@ clean-sim:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in sim" ; \
+       echo "Doing clean in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26957,7 +26230,7 @@ distclean-sim:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in sim" ; \
+       echo "Doing distclean in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -26982,7 +26255,7 @@ maintainer-clean-sim:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in sim" ; \
+       echo "Doing maintainer-clean in sim"; \
        (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27007,7 +26280,7 @@ configure-texinfo:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/texinfo; \
        cd "$(HOST_SUBDIR)/texinfo" || exit 1; \
@@ -27059,7 +26332,7 @@ check-texinfo:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -27100,7 +26373,7 @@ info-texinfo: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in texinfo" ; \
+       echo "Doing info in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27126,7 +26399,7 @@ dvi-texinfo: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in texinfo" ; \
+       echo "Doing dvi in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27152,7 +26425,7 @@ pdf-texinfo: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in texinfo" ; \
+       echo "Doing pdf in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27178,7 +26451,7 @@ html-texinfo: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in texinfo" ; \
+       echo "Doing html in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27204,7 +26477,7 @@ TAGS-texinfo: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in texinfo" ; \
+       echo "Doing TAGS in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27231,7 +26504,7 @@ install-info-texinfo: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in texinfo" ; \
+       echo "Doing install-info in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27258,7 +26531,7 @@ install-pdf-texinfo: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in texinfo" ; \
+       echo "Doing install-pdf in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27285,7 +26558,7 @@ install-html-texinfo: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in texinfo" ; \
+       echo "Doing install-html in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27311,7 +26584,7 @@ installcheck-texinfo: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in texinfo" ; \
+       echo "Doing installcheck in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27336,7 +26609,7 @@ mostlyclean-texinfo:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in texinfo" ; \
+       echo "Doing mostlyclean in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27361,7 +26634,7 @@ clean-texinfo:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in texinfo" ; \
+       echo "Doing clean in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27386,7 +26659,7 @@ distclean-texinfo:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in texinfo" ; \
+       echo "Doing distclean in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27411,7 +26684,7 @@ maintainer-clean-texinfo:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in texinfo" ; \
+       echo "Doing maintainer-clean in texinfo"; \
        (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27435,7 +26708,7 @@ configure-zlib:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/zlib; \
        cd "$(HOST_SUBDIR)/zlib" || exit 1; \
@@ -27470,8 +26743,8 @@ configure-stage1-zlib:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/zlib; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \
        cd $(HOST_SUBDIR)/zlib || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -27503,8 +26776,8 @@ configure-stage2-zlib:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/zlib; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \
        cd $(HOST_SUBDIR)/zlib || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -27516,7 +26789,7 @@ configure-stage2-zlib:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
@@ -27536,8 +26809,8 @@ configure-stage3-zlib:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/zlib; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \
        cd $(HOST_SUBDIR)/zlib || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -27549,7 +26822,7 @@ configure-stage3-zlib:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
@@ -27569,8 +26842,8 @@ configure-stage4-zlib:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/zlib; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \
        cd $(HOST_SUBDIR)/zlib || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -27582,7 +26855,7 @@ configure-stage4-zlib:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
@@ -27602,8 +26875,8 @@ configure-stageprofile-zlib:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/zlib; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \
        cd $(HOST_SUBDIR)/zlib || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -27615,7 +26888,7 @@ configure-stageprofile-zlib:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
@@ -27635,8 +26908,8 @@ configure-stagefeedback-zlib:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/zlib; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \
        cd $(HOST_SUBDIR)/zlib || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -27648,7 +26921,7 @@ configure-stagefeedback-zlib:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif zlib-bootstrap
 
@@ -27968,7 +27241,7 @@ info-zlib: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in zlib" ; \
+       echo "Doing info in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -27993,7 +27266,7 @@ dvi-zlib: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in zlib" ; \
+       echo "Doing dvi in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28018,7 +27291,7 @@ pdf-zlib: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in zlib" ; \
+       echo "Doing pdf in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28043,7 +27316,7 @@ html-zlib: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in zlib" ; \
+       echo "Doing html in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28068,7 +27341,7 @@ TAGS-zlib: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in zlib" ; \
+       echo "Doing TAGS in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28094,7 +27367,7 @@ install-info-zlib: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in zlib" ; \
+       echo "Doing install-info in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28120,7 +27393,7 @@ install-pdf-zlib: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in zlib" ; \
+       echo "Doing install-pdf in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28146,7 +27419,7 @@ install-html-zlib: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in zlib" ; \
+       echo "Doing install-html in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28171,7 +27444,7 @@ installcheck-zlib: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in zlib" ; \
+       echo "Doing installcheck in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28195,7 +27468,7 @@ mostlyclean-zlib:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in zlib" ; \
+       echo "Doing mostlyclean in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28219,7 +27492,7 @@ clean-zlib:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in zlib" ; \
+       echo "Doing clean in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28243,7 +27516,7 @@ distclean-zlib:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in zlib" ; \
+       echo "Doing distclean in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28267,7 +27540,7 @@ maintainer-clean-zlib:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in zlib" ; \
+       echo "Doing maintainer-clean in zlib"; \
        (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28292,7 +27565,7 @@ configure-gdb:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/gdb; \
        cd "$(HOST_SUBDIR)/gdb" || exit 1; \
@@ -28344,7 +27617,7 @@ check-gdb:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -28397,7 +27670,7 @@ info-gdb: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gdb" ; \
+       echo "Doing info in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28423,7 +27696,7 @@ dvi-gdb: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gdb" ; \
+       echo "Doing dvi in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28449,7 +27722,7 @@ pdf-gdb: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gdb" ; \
+       echo "Doing pdf in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28475,7 +27748,7 @@ html-gdb: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gdb" ; \
+       echo "Doing html in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28501,7 +27774,7 @@ TAGS-gdb: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gdb" ; \
+       echo "Doing TAGS in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28528,7 +27801,7 @@ install-info-gdb: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gdb" ; \
+       echo "Doing install-info in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28555,7 +27828,7 @@ install-pdf-gdb: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in gdb" ; \
+       echo "Doing install-pdf in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28582,7 +27855,7 @@ install-html-gdb: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in gdb" ; \
+       echo "Doing install-html in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28608,7 +27881,7 @@ installcheck-gdb: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gdb" ; \
+       echo "Doing installcheck in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28633,7 +27906,7 @@ mostlyclean-gdb:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gdb" ; \
+       echo "Doing mostlyclean in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28658,7 +27931,7 @@ clean-gdb:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gdb" ; \
+       echo "Doing clean in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28683,7 +27956,7 @@ distclean-gdb:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gdb" ; \
+       echo "Doing distclean in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28708,7 +27981,7 @@ maintainer-clean-gdb:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gdb" ; \
+       echo "Doing maintainer-clean in gdb"; \
        (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28733,7 +28006,7 @@ configure-expect:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/expect; \
        cd "$(HOST_SUBDIR)/expect" || exit 1; \
@@ -28785,7 +28058,7 @@ check-expect:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -28838,7 +28111,7 @@ info-expect: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in expect" ; \
+       echo "Doing info in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28864,7 +28137,7 @@ dvi-expect: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in expect" ; \
+       echo "Doing dvi in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28890,7 +28163,7 @@ pdf-expect: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in expect" ; \
+       echo "Doing pdf in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28916,7 +28189,7 @@ html-expect: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in expect" ; \
+       echo "Doing html in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28942,7 +28215,7 @@ TAGS-expect: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in expect" ; \
+       echo "Doing TAGS in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28969,7 +28242,7 @@ install-info-expect: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in expect" ; \
+       echo "Doing install-info in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -28996,7 +28269,7 @@ install-pdf-expect: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in expect" ; \
+       echo "Doing install-pdf in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29023,7 +28296,7 @@ install-html-expect: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in expect" ; \
+       echo "Doing install-html in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29049,7 +28322,7 @@ installcheck-expect: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in expect" ; \
+       echo "Doing installcheck in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29074,7 +28347,7 @@ mostlyclean-expect:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in expect" ; \
+       echo "Doing mostlyclean in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29099,7 +28372,7 @@ clean-expect:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in expect" ; \
+       echo "Doing clean in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29124,7 +28397,7 @@ distclean-expect:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in expect" ; \
+       echo "Doing distclean in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29149,7 +28422,7 @@ maintainer-clean-expect:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in expect" ; \
+       echo "Doing maintainer-clean in expect"; \
        (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29174,7 +28447,7 @@ configure-guile:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/guile; \
        cd "$(HOST_SUBDIR)/guile" || exit 1; \
@@ -29226,7 +28499,7 @@ check-guile:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -29279,7 +28552,7 @@ info-guile: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in guile" ; \
+       echo "Doing info in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29305,7 +28578,7 @@ dvi-guile: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in guile" ; \
+       echo "Doing dvi in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29331,7 +28604,7 @@ pdf-guile: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in guile" ; \
+       echo "Doing pdf in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29357,7 +28630,7 @@ html-guile: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in guile" ; \
+       echo "Doing html in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29383,7 +28656,7 @@ TAGS-guile: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in guile" ; \
+       echo "Doing TAGS in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29410,7 +28683,7 @@ install-info-guile: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in guile" ; \
+       echo "Doing install-info in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29437,7 +28710,7 @@ install-pdf-guile: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in guile" ; \
+       echo "Doing install-pdf in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29464,7 +28737,7 @@ install-html-guile: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in guile" ; \
+       echo "Doing install-html in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29490,7 +28763,7 @@ installcheck-guile: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in guile" ; \
+       echo "Doing installcheck in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29515,7 +28788,7 @@ mostlyclean-guile:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in guile" ; \
+       echo "Doing mostlyclean in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29540,7 +28813,7 @@ clean-guile:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in guile" ; \
+       echo "Doing clean in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29565,7 +28838,7 @@ distclean-guile:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in guile" ; \
+       echo "Doing distclean in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29590,7 +28863,7 @@ maintainer-clean-guile:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in guile" ; \
+       echo "Doing maintainer-clean in guile"; \
        (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29615,7 +28888,7 @@ configure-tk:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/tk; \
        cd "$(HOST_SUBDIR)/tk" || exit 1; \
@@ -29667,7 +28940,7 @@ check-tk:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -29720,7 +28993,7 @@ info-tk: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in tk" ; \
+       echo "Doing info in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29746,7 +29019,7 @@ dvi-tk: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in tk" ; \
+       echo "Doing dvi in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29772,7 +29045,7 @@ pdf-tk: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in tk" ; \
+       echo "Doing pdf in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29798,7 +29071,7 @@ html-tk: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in tk" ; \
+       echo "Doing html in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29824,7 +29097,7 @@ TAGS-tk: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in tk" ; \
+       echo "Doing TAGS in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29851,7 +29124,7 @@ install-info-tk: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in tk" ; \
+       echo "Doing install-info in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29878,7 +29151,7 @@ install-pdf-tk: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in tk" ; \
+       echo "Doing install-pdf in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29905,7 +29178,7 @@ install-html-tk: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in tk" ; \
+       echo "Doing install-html in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29931,7 +29204,7 @@ installcheck-tk: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in tk" ; \
+       echo "Doing installcheck in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29956,7 +29229,7 @@ mostlyclean-tk:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in tk" ; \
+       echo "Doing mostlyclean in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -29981,7 +29254,7 @@ clean-tk:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in tk" ; \
+       echo "Doing clean in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30006,7 +29279,7 @@ distclean-tk:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in tk" ; \
+       echo "Doing distclean in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30031,7 +29304,7 @@ maintainer-clean-tk:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in tk" ; \
+       echo "Doing maintainer-clean in tk"; \
        (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30056,7 +29329,7 @@ configure-libtermcap:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/libtermcap; \
        cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \
@@ -30155,7 +29428,7 @@ info-libtermcap: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libtermcap" ; \
+       echo "Doing info in libtermcap"; \
        (cd $(HOST_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30181,7 +29454,7 @@ dvi-libtermcap: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libtermcap" ; \
+       echo "Doing dvi in libtermcap"; \
        (cd $(HOST_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30207,7 +29480,7 @@ pdf-libtermcap: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libtermcap" ; \
+       echo "Doing pdf in libtermcap"; \
        (cd $(HOST_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30233,7 +29506,7 @@ html-libtermcap: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libtermcap" ; \
+       echo "Doing html in libtermcap"; \
        (cd $(HOST_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30259,7 +29532,7 @@ TAGS-libtermcap: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libtermcap" ; \
+       echo "Doing TAGS in libtermcap"; \
        (cd $(HOST_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30286,7 +29559,7 @@ install-info-libtermcap: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libtermcap" ; \
+       echo "Doing install-info in libtermcap"; \
        (cd $(HOST_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30313,7 +29586,7 @@ install-pdf-libtermcap: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in libtermcap" ; \
+       echo "Doing install-pdf in libtermcap"; \
        (cd $(HOST_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30340,7 +29613,7 @@ install-html-libtermcap: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in libtermcap" ; \
+       echo "Doing install-html in libtermcap"; \
        (cd $(HOST_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30366,7 +29639,7 @@ installcheck-libtermcap: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libtermcap" ; \
+       echo "Doing installcheck in libtermcap"; \
        (cd $(HOST_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30431,7 +29704,7 @@ configure-utils:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/utils; \
        cd "$(HOST_SUBDIR)/utils" || exit 1; \
@@ -30530,7 +29803,7 @@ info-utils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in utils" ; \
+       echo "Doing info in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30556,7 +29829,7 @@ dvi-utils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in utils" ; \
+       echo "Doing dvi in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30582,7 +29855,7 @@ pdf-utils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in utils" ; \
+       echo "Doing pdf in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30608,7 +29881,7 @@ html-utils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in utils" ; \
+       echo "Doing html in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30634,7 +29907,7 @@ TAGS-utils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in utils" ; \
+       echo "Doing TAGS in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30661,7 +29934,7 @@ install-info-utils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in utils" ; \
+       echo "Doing install-info in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30688,7 +29961,7 @@ install-pdf-utils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in utils" ; \
+       echo "Doing install-pdf in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30715,7 +29988,7 @@ install-html-utils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in utils" ; \
+       echo "Doing install-html in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30741,7 +30014,7 @@ installcheck-utils: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in utils" ; \
+       echo "Doing installcheck in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30766,7 +30039,7 @@ mostlyclean-utils:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in utils" ; \
+       echo "Doing mostlyclean in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30791,7 +30064,7 @@ clean-utils:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in utils" ; \
+       echo "Doing clean in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30816,7 +30089,7 @@ distclean-utils:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in utils" ; \
+       echo "Doing distclean in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30841,7 +30114,7 @@ maintainer-clean-utils:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in utils" ; \
+       echo "Doing maintainer-clean in utils"; \
        (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -30866,7 +30139,7 @@ configure-gnattools:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/gnattools; \
        cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
@@ -30918,7 +30191,7 @@ check-gnattools:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
        (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -30971,7 +30244,7 @@ info-gnattools: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gnattools" ; \
+       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}" \
@@ -30997,7 +30270,7 @@ dvi-gnattools: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gnattools" ; \
+       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}" \
@@ -31023,7 +30296,7 @@ pdf-gnattools: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gnattools" ; \
+       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}" \
@@ -31049,7 +30322,7 @@ html-gnattools: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gnattools" ; \
+       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}" \
@@ -31075,7 +30348,7 @@ TAGS-gnattools: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gnattools" ; \
+       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}" \
@@ -31102,7 +30375,7 @@ install-info-gnattools: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gnattools" ; \
+       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}" \
@@ -31129,7 +30402,7 @@ install-pdf-gnattools: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in gnattools" ; \
+       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}" \
@@ -31156,7 +30429,7 @@ install-html-gnattools: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in gnattools" ; \
+       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}" \
@@ -31182,7 +30455,7 @@ installcheck-gnattools: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gnattools" ; \
+       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}" \
@@ -31207,7 +30480,7 @@ mostlyclean-gnattools:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gnattools" ; \
+       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}" \
@@ -31232,7 +30505,7 @@ clean-gnattools:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gnattools" ; \
+       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}" \
@@ -31257,7 +30530,7 @@ distclean-gnattools:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gnattools" ; \
+       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}" \
@@ -31282,7 +30555,7 @@ maintainer-clean-gnattools:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gnattools" ; \
+       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}" \
@@ -31306,7 +30579,7 @@ 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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/lto-plugin; \
        cd "$(HOST_SUBDIR)/lto-plugin" || exit 1; \
@@ -31341,8 +30614,8 @@ configure-stage1-lto-plugin:
        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 ; \
+       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) ;; \
@@ -31375,8 +30648,8 @@ configure-stage2-lto-plugin:
        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 ; \
+       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) ;; \
@@ -31388,7 +30661,7 @@ configure-stage2-lto-plugin:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS) \
          --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
 @endif lto-plugin-bootstrap
@@ -31409,8 +30682,8 @@ configure-stage3-lto-plugin:
        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 ; \
+       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) ;; \
@@ -31422,7 +30695,7 @@ configure-stage3-lto-plugin:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS) \
          --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
 @endif lto-plugin-bootstrap
@@ -31443,8 +30716,8 @@ configure-stage4-lto-plugin:
        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 ; \
+       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) ;; \
@@ -31456,7 +30729,7 @@ configure-stage4-lto-plugin:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS) \
          --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
 @endif lto-plugin-bootstrap
@@ -31477,8 +30750,8 @@ configure-stageprofile-lto-plugin:
        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 ; \
+       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) ;; \
@@ -31490,7 +30763,7 @@ configure-stageprofile-lto-plugin:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS) \
          --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
 @endif lto-plugin-bootstrap
@@ -31511,8 +30784,8 @@ configure-stagefeedback-lto-plugin:
        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 ; \
+       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) ;; \
@@ -31524,7 +30797,7 @@ configure-stagefeedback-lto-plugin:
          --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS) \
          --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
 @endif lto-plugin-bootstrap
@@ -31811,9 +31084,9 @@ check-lto-plugin:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ check)
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif lto-plugin
 
@@ -31837,385 +31110,2243 @@ maybe-install-strip-lto-plugin:
 @if lto-plugin
 maybe-install-strip-lto-plugin: install-strip-lto-plugin
 
-install-strip-lto-plugin: installdirs
+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
+
+
+
+.PHONY: configure-libcc1 maybe-configure-libcc1
+maybe-configure-libcc1:
+@if gcc-bootstrap
+configure-libcc1: stage_current
+@endif gcc-bootstrap
+@if libcc1
+maybe-configure-libcc1: configure-libcc1
+configure-libcc1: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libcc1; \
+       cd "$(HOST_SUBDIR)/libcc1" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libcc1; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} --enable-shared \
+         || exit 1
+@endif libcc1
+
+
+
+
+
+.PHONY: all-libcc1 maybe-all-libcc1
+maybe-all-libcc1:
+@if gcc-bootstrap
+all-libcc1: stage_current
+@endif gcc-bootstrap
+@if libcc1
+TARGET-libcc1=all
+maybe-all-libcc1: all-libcc1
+all-libcc1: configure-libcc1
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libcc1))
+@endif libcc1
+
+
+
+
+.PHONY: check-libcc1 maybe-check-libcc1
+maybe-check-libcc1:
+@if libcc1
+maybe-check-libcc1: check-libcc1
+
+check-libcc1:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif libcc1
+
+.PHONY: install-libcc1 maybe-install-libcc1
+maybe-install-libcc1:
+@if libcc1
+maybe-install-libcc1: install-libcc1
+
+install-libcc1: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif libcc1
+
+.PHONY: install-strip-libcc1 maybe-install-strip-libcc1
+maybe-install-strip-libcc1:
+@if libcc1
+maybe-install-strip-libcc1: install-strip-libcc1
+
+install-strip-libcc1: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif libcc1
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libcc1 info-libcc1
+maybe-info-libcc1:
+@if libcc1
+maybe-info-libcc1: info-libcc1
+
+info-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+.PHONY: maybe-dvi-libcc1 dvi-libcc1
+maybe-dvi-libcc1:
+@if libcc1
+maybe-dvi-libcc1: dvi-libcc1
+
+dvi-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+.PHONY: maybe-pdf-libcc1 pdf-libcc1
+maybe-pdf-libcc1:
+@if libcc1
+maybe-pdf-libcc1: pdf-libcc1
+
+pdf-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+.PHONY: maybe-html-libcc1 html-libcc1
+maybe-html-libcc1:
+@if libcc1
+maybe-html-libcc1: html-libcc1
+
+html-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+.PHONY: maybe-TAGS-libcc1 TAGS-libcc1
+maybe-TAGS-libcc1:
+@if libcc1
+maybe-TAGS-libcc1: TAGS-libcc1
+
+TAGS-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+.PHONY: maybe-install-info-libcc1 install-info-libcc1
+maybe-install-info-libcc1:
+@if libcc1
+maybe-install-info-libcc1: install-info-libcc1
+
+install-info-libcc1: \
+    configure-libcc1 \
+    info-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+.PHONY: maybe-install-pdf-libcc1 install-pdf-libcc1
+maybe-install-pdf-libcc1:
+@if libcc1
+maybe-install-pdf-libcc1: install-pdf-libcc1
+
+install-pdf-libcc1: \
+    configure-libcc1 \
+    pdf-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+.PHONY: maybe-install-html-libcc1 install-html-libcc1
+maybe-install-html-libcc1:
+@if libcc1
+maybe-install-html-libcc1: install-html-libcc1
+
+install-html-libcc1: \
+    configure-libcc1 \
+    html-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+.PHONY: maybe-installcheck-libcc1 installcheck-libcc1
+maybe-installcheck-libcc1:
+@if libcc1
+maybe-installcheck-libcc1: installcheck-libcc1
+
+installcheck-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+.PHONY: maybe-mostlyclean-libcc1 mostlyclean-libcc1
+maybe-mostlyclean-libcc1:
+@if libcc1
+maybe-mostlyclean-libcc1: mostlyclean-libcc1
+
+mostlyclean-libcc1: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+.PHONY: maybe-clean-libcc1 clean-libcc1
+maybe-clean-libcc1:
+@if libcc1
+maybe-clean-libcc1: clean-libcc1
+
+clean-libcc1: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+.PHONY: maybe-distclean-libcc1 distclean-libcc1
+maybe-distclean-libcc1:
+@if libcc1
+maybe-distclean-libcc1: distclean-libcc1
+
+distclean-libcc1: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+.PHONY: maybe-maintainer-clean-libcc1 maintainer-clean-libcc1
+maybe-maintainer-clean-libcc1:
+@if libcc1
+maybe-maintainer-clean-libcc1: maintainer-clean-libcc1
+
+maintainer-clean-libcc1: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/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 libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(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 libcc1
+
+
+
+.PHONY: configure-gotools maybe-configure-gotools
+maybe-configure-gotools:
+@if gcc-bootstrap
+configure-gotools: stage_current
+@endif gcc-bootstrap
+@if gotools
+maybe-configure-gotools: configure-gotools
+configure-gotools: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(HOST_SUBDIR)/gotools/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gotools; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/gotools; \
+       cd "$(HOST_SUBDIR)/gotools" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gotools/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=gotools; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias}  \
+         || exit 1
+@endif gotools
+
+
+
+
+
+.PHONY: all-gotools maybe-all-gotools
+maybe-all-gotools:
+@if gcc-bootstrap
+all-gotools: stage_current
+@endif gcc-bootstrap
+@if gotools
+TARGET-gotools=all
+maybe-all-gotools: all-gotools
+all-gotools: configure-gotools
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gotools))
+@endif gotools
+
+
+
+
+.PHONY: check-gotools maybe-check-gotools
+maybe-check-gotools:
+@if gotools
+maybe-check-gotools: check-gotools
+
+check-gotools:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif gotools
+
+.PHONY: install-gotools maybe-install-gotools
+maybe-install-gotools:
+@if gotools
+maybe-install-gotools: install-gotools
+
+install-gotools: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif gotools
+
+.PHONY: install-strip-gotools maybe-install-strip-gotools
+maybe-install-strip-gotools:
+@if gotools
+maybe-install-strip-gotools: install-strip-gotools
+
+install-strip-gotools: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gotools
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gotools info-gotools
+maybe-info-gotools:
+@if gotools
+maybe-info-gotools: info-gotools
+
+info-gotools: \
+    configure-gotools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+.PHONY: maybe-dvi-gotools dvi-gotools
+maybe-dvi-gotools:
+@if gotools
+maybe-dvi-gotools: dvi-gotools
+
+dvi-gotools: \
+    configure-gotools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+.PHONY: maybe-pdf-gotools pdf-gotools
+maybe-pdf-gotools:
+@if gotools
+maybe-pdf-gotools: pdf-gotools
+
+pdf-gotools: \
+    configure-gotools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+.PHONY: maybe-html-gotools html-gotools
+maybe-html-gotools:
+@if gotools
+maybe-html-gotools: html-gotools
+
+html-gotools: \
+    configure-gotools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+.PHONY: maybe-TAGS-gotools TAGS-gotools
+maybe-TAGS-gotools:
+@if gotools
+maybe-TAGS-gotools: TAGS-gotools
+
+TAGS-gotools: \
+    configure-gotools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+.PHONY: maybe-install-info-gotools install-info-gotools
+maybe-install-info-gotools:
+@if gotools
+maybe-install-info-gotools: install-info-gotools
+
+install-info-gotools: \
+    configure-gotools \
+    info-gotools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+.PHONY: maybe-install-pdf-gotools install-pdf-gotools
+maybe-install-pdf-gotools:
+@if gotools
+maybe-install-pdf-gotools: install-pdf-gotools
+
+install-pdf-gotools: \
+    configure-gotools \
+    pdf-gotools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+.PHONY: maybe-install-html-gotools install-html-gotools
+maybe-install-html-gotools:
+@if gotools
+maybe-install-html-gotools: install-html-gotools
+
+install-html-gotools: \
+    configure-gotools \
+    html-gotools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+.PHONY: maybe-installcheck-gotools installcheck-gotools
+maybe-installcheck-gotools:
+@if gotools
+maybe-installcheck-gotools: installcheck-gotools
+
+installcheck-gotools: \
+    configure-gotools 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+.PHONY: maybe-mostlyclean-gotools mostlyclean-gotools
+maybe-mostlyclean-gotools:
+@if gotools
+maybe-mostlyclean-gotools: mostlyclean-gotools
+
+mostlyclean-gotools: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+.PHONY: maybe-clean-gotools clean-gotools
+maybe-clean-gotools:
+@if gotools
+maybe-clean-gotools: clean-gotools
+
+clean-gotools: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+.PHONY: maybe-distclean-gotools distclean-gotools
+maybe-distclean-gotools:
+@if gotools
+maybe-distclean-gotools: distclean-gotools
+
+distclean-gotools: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+.PHONY: maybe-maintainer-clean-gotools maintainer-clean-gotools
+maybe-maintainer-clean-gotools:
+@if gotools
+maybe-maintainer-clean-gotools: maintainer-clean-gotools
+
+maintainer-clean-gotools: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gotools/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 gotools"; \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(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 gotools
+
+
+
+# ---------------------------------------
+# 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: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
+maybe-check-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
+
+check-target-libstdc++-v3:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
+
+@endif target-libstdc++-v3
+
+.PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
+maybe-install-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
+
+install-target-libstdc++-v3: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libstdc++-v3
+
+.PHONY: install-strip-target-libstdc++-v3 maybe-install-strip-target-libstdc++-v3
+maybe-install-strip-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-strip-target-libstdc++-v3: install-strip-target-libstdc++-v3
+
+install-strip-target-libstdc++-v3: 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)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif lto-plugin
+@endif target-libstdc++-v3
 
 # 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-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-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
+@endif target-libstdc++-v3
 
-.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-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-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+dvi-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
+@endif target-libstdc++-v3
 
-.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-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-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+pdf-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
+@endif target-libstdc++-v3
 
-.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-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-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
+@endif target-libstdc++-v3
 
-.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-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-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+TAGS-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
+@endif target-libstdc++-v3
 
-.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-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-lto-plugin: \
-    configure-lto-plugin \
-    info-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+install-info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    info-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
+@endif target-libstdc++-v3
 
-.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-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-lto-plugin: \
-    configure-lto-plugin \
-    pdf-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+install-pdf-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    pdf-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
+@endif target-libstdc++-v3
 
-.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-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-lto-plugin: \
-    configure-lto-plugin \
-    html-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+install-html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    html-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
+@endif target-libstdc++-v3
 
-.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-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-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+installcheck-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
+@endif target-libstdc++-v3
 
-.PHONY: maybe-mostlyclean-lto-plugin mostlyclean-lto-plugin
-maybe-mostlyclean-lto-plugin:
-@if lto-plugin
-maybe-mostlyclean-lto-plugin: mostlyclean-lto-plugin
+.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-lto-plugin: 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+mostlyclean-target-libstdc++-v3: 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
+@endif target-libstdc++-v3
 
-.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-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-lto-plugin: 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+clean-target-libstdc++-v3: 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
+@endif target-libstdc++-v3
 
-.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-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-lto-plugin: 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+distclean-target-libstdc++-v3: 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
+@endif target-libstdc++-v3
 
-.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-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-lto-plugin: 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
+maintainer-clean-target-libstdc++-v3: 
+       @: $(MAKE); $(unstage)
+       @[ -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) @extra_linker_plugin_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 lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
+       (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 lto-plugin
-
-
+@endif target-libstdc++-v3
 
-# ---------------------------------------
-# 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-libsanitizer maybe-configure-target-libsanitizer
+maybe-configure-target-libsanitizer:
 @if gcc-bootstrap
-configure-target-libstdc++-v3: stage_current
+configure-target-libsanitizer: stage_current
 @endif gcc-bootstrap
-@if target-libstdc++-v3
-maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
-configure-target-libstdc++-v3
+@if target-libsanitizer
+maybe-configure-target-libsanitizer: configure-target-libsanitizer
+configure-target-libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for 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 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)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
        $(RAW_CXX_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libsanitizer; \
+       cd "$(TARGET_SUBDIR)/libsanitizer" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       module_srcdir=libsanitizer; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) \
          $$s/$$module_srcdir/configure \
@@ -32223,317 +33354,317 @@ configure-target-libstdc++-v3:
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
 
 
-.PHONY: configure-stage1-target-libstdc++-v3 maybe-configure-stage1-target-libstdc++-v3
-maybe-configure-stage1-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
-configure-stage1-target-libstdc++-v3:
+.PHONY: configure-stage1-target-libsanitizer maybe-configure-stage1-target-libsanitizer
+maybe-configure-stage1-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
+configure-stage1-target-libsanitizer:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       echo "Checking multilib configuration for 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 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)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       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)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       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-libstdc++-v3-bootstrap
+@endif target-libsanitizer-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-libsanitizer maybe-configure-stage2-target-libsanitizer
+maybe-configure-stage2-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
+configure-stage2-target-libsanitizer:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       echo "Checking multilib configuration for 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 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)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       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)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif target-libsanitizer-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-libsanitizer maybe-configure-stage3-target-libsanitizer
+maybe-configure-stage3-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
+configure-stage3-target-libsanitizer:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(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 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 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)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       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)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif target-libsanitizer-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-libsanitizer maybe-configure-stage4-target-libsanitizer
+maybe-configure-stage4-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
+configure-stage4-target-libsanitizer:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       echo "Checking multilib configuration for 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 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)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       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)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif target-libsanitizer-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-libsanitizer maybe-configure-stageprofile-target-libsanitizer
+maybe-configure-stageprofile-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
+configure-stageprofile-target-libsanitizer:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       echo "Checking multilib configuration for 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 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)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       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)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif target-libsanitizer-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-libsanitizer maybe-configure-stagefeedback-target-libsanitizer
+maybe-configure-stagefeedback-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer
+configure-stagefeedback-target-libsanitizer:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       echo "Checking multilib configuration for 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 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)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       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)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libstdc++-v3; \
+       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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+@endif target-libsanitizer-bootstrap
 
 
 
 
 
-.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
-maybe-all-target-libstdc++-v3:
+.PHONY: all-target-libsanitizer maybe-all-target-libsanitizer
+maybe-all-target-libsanitizer:
 @if gcc-bootstrap
-all-target-libstdc++-v3: stage_current
+all-target-libsanitizer: 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-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; \
        $(RAW_CXX_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       (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-libstdc++-v3))
-@endif target-libstdc++-v3
+               $(TARGET-target-libsanitizer))
+@endif target-libsanitizer
 
 
 
-.PHONY: all-stage1-target-libstdc++-v3 maybe-all-stage1-target-libstdc++-v3
-.PHONY: clean-stage1-target-libstdc++-v3 maybe-clean-stage1-target-libstdc++-v3
-maybe-all-stage1-target-libstdc++-v3:
-maybe-clean-stage1-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stage1-target-libstdc++-v3: all-stage1-target-libstdc++-v3
-all-stage1: all-stage1-target-libstdc++-v3
-TARGET-stage1-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
+.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)"; \
        $(RAW_CXX_TARGET_EXPORTS)  \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -32544,39 +33675,39 @@ all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
                $(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-libsanitizer)
 
-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-libsanitizer: clean-stage1-target-libsanitizer
+clean-stage1: clean-stage1-target-libsanitizer
+clean-stage1-target-libsanitizer:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage1-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
          clean
-@endif target-libstdc++-v3-bootstrap
+@endif target-libsanitizer-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
+.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)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -32586,38 +33717,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-libsanitizer)
 
-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-libsanitizer: clean-stage2-target-libsanitizer
+clean-stage2: clean-stage2-target-libsanitizer
+clean-stage2-target-libsanitizer:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage2-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
+@endif target-libsanitizer-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
+.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)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -32627,38 +33758,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-libsanitizer)
 
-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-libsanitizer: clean-stage3-target-libsanitizer
+clean-stage3: clean-stage3-target-libsanitizer
+clean-stage3-target-libsanitizer:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage3-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
+@endif target-libsanitizer-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
+.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)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -32668,38 +33799,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-libsanitizer)
 
-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-libsanitizer: clean-stage4-target-libsanitizer
+clean-stage4: clean-stage4-target-libsanitizer
+clean-stage4-target-libsanitizer:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage4-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
+@endif target-libsanitizer-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
+.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)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -32709,38 +33840,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-libsanitizer)
 
-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-libsanitizer: clean-stageprofile-target-libsanitizer
+clean-stageprofile: clean-stageprofile-target-libsanitizer
+clean-stageprofile-target-libsanitizer:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
+@endif target-libsanitizer-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
+.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)"; \
        $(RAW_CXX_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -32750,90 +33881,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-libsanitizer)
 
-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-libsanitizer: clean-stagefeedback-target-libsanitizer
+clean-stagefeedback: clean-stagefeedback-target-libsanitizer
+clean-stagefeedback-target-libsanitizer:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libsanitizer/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
        $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
+@endif target-libsanitizer-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-libsanitizer maybe-check-target-libsanitizer
+maybe-check-target-libsanitizer:
+@if target-libsanitizer
+maybe-check-target-libsanitizer: check-target-libsanitizer
 
-check-target-libstdc++-v3:
+check-target-libsanitizer:
        @: $(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)/libsanitizer && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
-maybe-install-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
+.PHONY: install-target-libsanitizer maybe-install-target-libsanitizer
+maybe-install-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-target-libsanitizer: install-target-libsanitizer
 
-install-target-libstdc++-v3: installdirs
+install-target-libsanitizer: 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)/libsanitizer && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: install-strip-target-libstdc++-v3 maybe-install-strip-target-libstdc++-v3
-maybe-install-strip-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-strip-target-libstdc++-v3: install-strip-target-libstdc++-v3
+.PHONY: install-strip-target-libsanitizer maybe-install-strip-target-libsanitizer
+maybe-install-strip-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-strip-target-libsanitizer: install-strip-target-libsanitizer
 
-install-strip-target-libstdc++-v3: installdirs
+install-strip-target-libsanitizer: 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)/libsanitizer && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
 # 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-libsanitizer info-target-libsanitizer
+maybe-info-target-libsanitizer:
+@if target-libsanitizer
+maybe-info-target-libsanitizer: info-target-libsanitizer
 
-info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+info-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32841,25 +33972,25 @@ info-target-libstdc++-v3: \
                   info) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: maybe-dvi-target-libstdc++-v3 dvi-target-libstdc++-v3
-maybe-dvi-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
+.PHONY: maybe-dvi-target-libsanitizer dvi-target-libsanitizer
+maybe-dvi-target-libsanitizer:
+@if target-libsanitizer
+maybe-dvi-target-libsanitizer: dvi-target-libsanitizer
 
-dvi-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+dvi-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32867,25 +33998,25 @@ dvi-target-libstdc++-v3: \
                   dvi) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: maybe-pdf-target-libstdc++-v3 pdf-target-libstdc++-v3
-maybe-pdf-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-pdf-target-libstdc++-v3: pdf-target-libstdc++-v3
+.PHONY: maybe-pdf-target-libsanitizer pdf-target-libsanitizer
+maybe-pdf-target-libsanitizer:
+@if target-libsanitizer
+maybe-pdf-target-libsanitizer: pdf-target-libsanitizer
 
-pdf-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+pdf-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32893,25 +34024,25 @@ pdf-target-libstdc++-v3: \
                   pdf) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3
-maybe-html-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
+.PHONY: maybe-html-target-libsanitizer html-target-libsanitizer
+maybe-html-target-libsanitizer:
+@if target-libsanitizer
+maybe-html-target-libsanitizer: html-target-libsanitizer
 
-html-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+html-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32919,25 +34050,25 @@ html-target-libstdc++-v3: \
                   html) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
+.PHONY: maybe-TAGS-target-libsanitizer TAGS-target-libsanitizer
+maybe-TAGS-target-libsanitizer:
+@if target-libsanitizer
+maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer
 
-TAGS-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+TAGS-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32945,26 +34076,26 @@ TAGS-target-libstdc++-v3: \
                   TAGS) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3
-maybe-install-info-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
+.PHONY: maybe-install-info-target-libsanitizer install-info-target-libsanitizer
+maybe-install-info-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-info-target-libsanitizer: install-info-target-libsanitizer
 
-install-info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    info-target-libstdc++-v3 
+install-info-target-libsanitizer: \
+    configure-target-libsanitizer \
+    info-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32972,26 +34103,26 @@ install-info-target-libstdc++-v3: \
                   install-info) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: maybe-install-pdf-target-libstdc++-v3 install-pdf-target-libstdc++-v3
-maybe-install-pdf-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-pdf-target-libstdc++-v3: install-pdf-target-libstdc++-v3
+.PHONY: maybe-install-pdf-target-libsanitizer install-pdf-target-libsanitizer
+maybe-install-pdf-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-pdf-target-libsanitizer: install-pdf-target-libsanitizer
 
-install-pdf-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    pdf-target-libstdc++-v3 
+install-pdf-target-libsanitizer: \
+    configure-target-libsanitizer \
+    pdf-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32999,26 +34130,26 @@ install-pdf-target-libstdc++-v3: \
                   install-pdf) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: maybe-install-html-target-libstdc++-v3 install-html-target-libstdc++-v3
-maybe-install-html-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-html-target-libstdc++-v3: install-html-target-libstdc++-v3
+.PHONY: maybe-install-html-target-libsanitizer install-html-target-libsanitizer
+maybe-install-html-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-html-target-libsanitizer: install-html-target-libsanitizer
 
-install-html-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    html-target-libstdc++-v3 
+install-html-target-libsanitizer: \
+    configure-target-libsanitizer \
+    html-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33026,25 +34157,25 @@ install-html-target-libstdc++-v3: \
                   install-html) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3
-maybe-installcheck-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
+.PHONY: maybe-installcheck-target-libsanitizer installcheck-target-libsanitizer
+maybe-installcheck-target-libsanitizer:
+@if target-libsanitizer
+maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer
 
-installcheck-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+installcheck-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33052,24 +34183,24 @@ installcheck-target-libstdc++-v3: \
                   installcheck) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: maybe-mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3
-maybe-mostlyclean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
+.PHONY: maybe-mostlyclean-target-libsanitizer mostlyclean-target-libsanitizer
+maybe-mostlyclean-target-libsanitizer:
+@if target-libsanitizer
+maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer
 
-mostlyclean-target-libstdc++-v3
+mostlyclean-target-libsanitizer
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33077,24 +34208,24 @@ mostlyclean-target-libstdc++-v3:
                   mostlyclean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: maybe-clean-target-libstdc++-v3 clean-target-libstdc++-v3
-maybe-clean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
+.PHONY: maybe-clean-target-libsanitizer clean-target-libsanitizer
+maybe-clean-target-libsanitizer:
+@if target-libsanitizer
+maybe-clean-target-libsanitizer: clean-target-libsanitizer
 
-clean-target-libstdc++-v3
+clean-target-libsanitizer
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33102,24 +34233,24 @@ clean-target-libstdc++-v3:
                   clean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: maybe-distclean-target-libstdc++-v3 distclean-target-libstdc++-v3
-maybe-distclean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
+.PHONY: maybe-distclean-target-libsanitizer distclean-target-libsanitizer
+maybe-distclean-target-libsanitizer:
+@if target-libsanitizer
+maybe-distclean-target-libsanitizer: distclean-target-libsanitizer
 
-distclean-target-libstdc++-v3
+distclean-target-libsanitizer
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33127,24 +34258,24 @@ distclean-target-libstdc++-v3:
                   distclean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
-.PHONY: maybe-maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3
-maybe-maintainer-clean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
+.PHONY: maybe-maintainer-clean-target-libsanitizer maintainer-clean-target-libsanitizer
+maybe-maintainer-clean-target-libsanitizer:
+@if target-libsanitizer
+maybe-maintainer-clean-target-libsanitizer: maintainer-clean-target-libsanitizer
 
-maintainer-clean-target-libstdc++-v3
+maintainer-clean-target-libsanitizer
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer"; \
        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)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33152,46 +34283,46 @@ maintainer-clean-target-libstdc++-v3:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libsanitizer
 
 
 
 
 
-.PHONY: configure-target-libsanitizer maybe-configure-target-libsanitizer
-maybe-configure-target-libsanitizer:
+.PHONY: configure-target-libmpx maybe-configure-target-libmpx
+maybe-configure-target-libmpx:
 @if gcc-bootstrap
-configure-target-libsanitizer: stage_current
+configure-target-libmpx: stage_current
 @endif gcc-bootstrap
-@if target-libsanitizer
-maybe-configure-target-libsanitizer: configure-target-libsanitizer
-configure-target-libsanitizer
+@if target-libmpx
+maybe-configure-target-libmpx: configure-target-libmpx
+configure-target-libmpx
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/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; \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libmpx; \
+       cd "$(TARGET_SUBDIR)/libmpx" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libmpx; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) \
          $$s/$$module_srcdir/configure \
@@ -33199,317 +34330,317 @@ configure-target-libsanitizer:
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias}  \
          || exit 1
-@endif target-libsanitizer
+@endif target-libmpx
 
 
 
-.PHONY: configure-stage1-target-libsanitizer maybe-configure-stage1-target-libsanitizer
-maybe-configure-stage1-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
-configure-stage1-target-libsanitizer:
+.PHONY: configure-stage1-target-libmpx maybe-configure-stage1-target-libmpx
+maybe-configure-stage1-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stage1-target-libmpx: configure-stage1-target-libmpx
+configure-stage1-target-libmpx:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(NORMAL_TARGET_EXPORTS) \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(TARGET_SUBDIR)/libsanitizer ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libmpx; \
        $(SHELL) $$s/$$module_srcdir/configure \
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
           \
          $(STAGE1_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libmpx-bootstrap
 
-.PHONY: configure-stage2-target-libsanitizer maybe-configure-stage2-target-libsanitizer
-maybe-configure-stage2-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
-configure-stage2-target-libsanitizer:
+.PHONY: configure-stage2-target-libmpx maybe-configure-stage2-target-libmpx
+maybe-configure-stage2-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stage2-target-libmpx: configure-stage2-target-libmpx
+configure-stage2-target-libmpx:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(NORMAL_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(TARGET_SUBDIR)/libsanitizer ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libmpx; \
        $(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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libmpx-bootstrap
 
-.PHONY: configure-stage3-target-libsanitizer maybe-configure-stage3-target-libsanitizer
-maybe-configure-stage3-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
-configure-stage3-target-libsanitizer:
+.PHONY: configure-stage3-target-libmpx maybe-configure-stage3-target-libmpx
+maybe-configure-stage3-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stage3-target-libmpx: configure-stage3-target-libmpx
+configure-stage3-target-libmpx:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(NORMAL_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(TARGET_SUBDIR)/libsanitizer ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libmpx; \
        $(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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libmpx-bootstrap
 
-.PHONY: configure-stage4-target-libsanitizer maybe-configure-stage4-target-libsanitizer
-maybe-configure-stage4-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
-configure-stage4-target-libsanitizer:
+.PHONY: configure-stage4-target-libmpx maybe-configure-stage4-target-libmpx
+maybe-configure-stage4-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stage4-target-libmpx: configure-stage4-target-libmpx
+configure-stage4-target-libmpx:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(NORMAL_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(TARGET_SUBDIR)/libsanitizer ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libmpx; \
        $(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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libmpx-bootstrap
 
-.PHONY: configure-stageprofile-target-libsanitizer maybe-configure-stageprofile-target-libsanitizer
-maybe-configure-stageprofile-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
-configure-stageprofile-target-libsanitizer:
+.PHONY: configure-stageprofile-target-libmpx maybe-configure-stageprofile-target-libmpx
+maybe-configure-stageprofile-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stageprofile-target-libmpx: configure-stageprofile-target-libmpx
+configure-stageprofile-target-libmpx:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(NORMAL_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(TARGET_SUBDIR)/libsanitizer ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libmpx; \
        $(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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libmpx-bootstrap
 
-.PHONY: configure-stagefeedback-target-libsanitizer maybe-configure-stagefeedback-target-libsanitizer
-maybe-configure-stagefeedback-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer
-configure-stagefeedback-target-libsanitizer:
+.PHONY: configure-stagefeedback-target-libmpx maybe-configure-stagefeedback-target-libmpx
+maybe-configure-stagefeedback-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx
+configure-stagefeedback-target-libmpx:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       echo "Checking multilib configuration for libsanitizer..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(NORMAL_TARGET_EXPORTS) \
         \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(TARGET_SUBDIR)/libsanitizer ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       module_srcdir=libsanitizer; \
+       module_srcdir=libmpx; \
        $(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)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
+@endif target-libmpx-bootstrap
 
 
 
 
 
-.PHONY: all-target-libsanitizer maybe-all-target-libsanitizer
-maybe-all-target-libsanitizer:
+.PHONY: all-target-libmpx maybe-all-target-libmpx
+maybe-all-target-libmpx:
 @if gcc-bootstrap
-all-target-libsanitizer: stage_current
+all-target-libmpx: stage_current
 @endif gcc-bootstrap
-@if target-libsanitizer
-TARGET-target-libsanitizer=all
-maybe-all-target-libsanitizer: all-target-libsanitizer
-all-target-libsanitizer: configure-target-libsanitizer
+@if target-libmpx
+TARGET-target-libmpx=all
+maybe-all-target-libmpx: all-target-libmpx
+all-target-libmpx: configure-target-libmpx
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(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
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libmpx))
+@endif target-libmpx
 
 
 
-.PHONY: all-stage1-target-libsanitizer maybe-all-stage1-target-libsanitizer
-.PHONY: clean-stage1-target-libsanitizer maybe-clean-stage1-target-libsanitizer
-maybe-all-stage1-target-libsanitizer:
-maybe-clean-stage1-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stage1-target-libsanitizer: all-stage1-target-libsanitizer
-all-stage1: all-stage1-target-libsanitizer
-TARGET-stage1-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
+.PHONY: all-stage1-target-libmpx maybe-all-stage1-target-libmpx
+.PHONY: clean-stage1-target-libmpx maybe-clean-stage1-target-libmpx
+maybe-all-stage1-target-libmpx:
+maybe-clean-stage1-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stage1-target-libmpx: all-stage1-target-libmpx
+all-stage1: all-stage1-target-libmpx
+TARGET-stage1-target-libmpx = $(TARGET-target-libmpx)
+all-stage1-target-libmpx: configure-stage1-target-libmpx
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS)  \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(NORMAL_TARGET_EXPORTS)  \
+       cd $(TARGET_SUBDIR)/libmpx && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33517,42 +34648,42 @@ all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
                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)  \
                  \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-target-libsanitizer)
+               $(TARGET-stage1-target-libmpx)
 
-maybe-clean-stage1-target-libsanitizer: clean-stage1-target-libsanitizer
-clean-stage1: clean-stage1-target-libsanitizer
-clean-stage1-target-libsanitizer:
+maybe-clean-stage1-target-libmpx: clean-stage1-target-libmpx
+clean-stage1: clean-stage1-target-libmpx
+clean-stage1-target-libmpx:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage1-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage1-libmpx/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
          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
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stage2-target-libmpx maybe-all-stage2-target-libmpx
+.PHONY: clean-stage2-target-libmpx maybe-clean-stage2-target-libmpx
+maybe-all-stage2-target-libmpx:
+maybe-clean-stage2-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stage2-target-libmpx: all-stage2-target-libmpx
+all-stage2: all-stage2-target-libmpx
+TARGET-stage2-target-libmpx = $(TARGET-target-libmpx)
+all-stage2-target-libmpx: configure-stage2-target-libmpx
        @[ $(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) \
+       $(NORMAL_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libmpx && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33560,40 +34691,40 @@ all-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
                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)   \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-target-libsanitizer)
+               $(TARGET-stage2-target-libmpx)
 
-maybe-clean-stage2-target-libsanitizer: clean-stage2-target-libsanitizer
-clean-stage2: clean-stage2-target-libsanitizer
-clean-stage2-target-libsanitizer:
+maybe-clean-stage2-target-libmpx: clean-stage2-target-libmpx
+clean-stage2: clean-stage2-target-libmpx
+clean-stage2-target-libmpx:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage2-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage2-libmpx/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       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
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stage3-target-libmpx maybe-all-stage3-target-libmpx
+.PHONY: clean-stage3-target-libmpx maybe-clean-stage3-target-libmpx
+maybe-all-stage3-target-libmpx:
+maybe-clean-stage3-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stage3-target-libmpx: all-stage3-target-libmpx
+all-stage3: all-stage3-target-libmpx
+TARGET-stage3-target-libmpx = $(TARGET-target-libmpx)
+all-stage3-target-libmpx: configure-stage3-target-libmpx
        @[ $(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) \
+       $(NORMAL_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libmpx && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33601,40 +34732,40 @@ all-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
                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)   \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-target-libsanitizer)
+               $(TARGET-stage3-target-libmpx)
 
-maybe-clean-stage3-target-libsanitizer: clean-stage3-target-libsanitizer
-clean-stage3: clean-stage3-target-libsanitizer
-clean-stage3-target-libsanitizer:
+maybe-clean-stage3-target-libmpx: clean-stage3-target-libmpx
+clean-stage3: clean-stage3-target-libmpx
+clean-stage3-target-libmpx:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage3-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage3-libmpx/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       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
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stage4-target-libmpx maybe-all-stage4-target-libmpx
+.PHONY: clean-stage4-target-libmpx maybe-clean-stage4-target-libmpx
+maybe-all-stage4-target-libmpx:
+maybe-clean-stage4-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stage4-target-libmpx: all-stage4-target-libmpx
+all-stage4: all-stage4-target-libmpx
+TARGET-stage4-target-libmpx = $(TARGET-target-libmpx)
+all-stage4-target-libmpx: configure-stage4-target-libmpx
        @[ $(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) \
+       $(NORMAL_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libmpx && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33642,40 +34773,40 @@ all-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
                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)   \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-target-libsanitizer)
+               $(TARGET-stage4-target-libmpx)
 
-maybe-clean-stage4-target-libsanitizer: clean-stage4-target-libsanitizer
-clean-stage4: clean-stage4-target-libsanitizer
-clean-stage4-target-libsanitizer:
+maybe-clean-stage4-target-libmpx: clean-stage4-target-libmpx
+clean-stage4: clean-stage4-target-libmpx
+clean-stage4-target-libmpx:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stage4-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage4-libmpx/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       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
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stageprofile-target-libmpx maybe-all-stageprofile-target-libmpx
+.PHONY: clean-stageprofile-target-libmpx maybe-clean-stageprofile-target-libmpx
+maybe-all-stageprofile-target-libmpx:
+maybe-clean-stageprofile-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stageprofile-target-libmpx: all-stageprofile-target-libmpx
+all-stageprofile: all-stageprofile-target-libmpx
+TARGET-stageprofile-target-libmpx = $(TARGET-target-libmpx)
+all-stageprofile-target-libmpx: configure-stageprofile-target-libmpx
        @[ $(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) \
+       $(NORMAL_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libmpx && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33683,40 +34814,40 @@ all-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
                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)   \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-target-libsanitizer)
+               $(TARGET-stageprofile-target-libmpx)
 
-maybe-clean-stageprofile-target-libsanitizer: clean-stageprofile-target-libsanitizer
-clean-stageprofile: clean-stageprofile-target-libsanitizer
-clean-stageprofile-target-libsanitizer:
+maybe-clean-stageprofile-target-libmpx: clean-stageprofile-target-libmpx
+clean-stageprofile: clean-stageprofile-target-libmpx
+clean-stageprofile-target-libmpx:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stageprofile-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libmpx/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       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
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libmpx maybe-all-stagefeedback-target-libmpx
+.PHONY: clean-stagefeedback-target-libmpx maybe-clean-stagefeedback-target-libmpx
+maybe-all-stagefeedback-target-libmpx:
+maybe-clean-stagefeedback-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stagefeedback-target-libmpx: all-stagefeedback-target-libmpx
+all-stagefeedback: all-stagefeedback-target-libmpx
+TARGET-stagefeedback-target-libmpx = $(TARGET-target-libmpx)
+all-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx
        @[ $(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) \
+       $(NORMAL_TARGET_EXPORTS) \
          \
-       cd $(TARGET_SUBDIR)/libsanitizer && \
+       cd $(TARGET_SUBDIR)/libmpx && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33724,92 +34855,92 @@ all-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitiz
                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)   \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-target-libsanitizer)
+               $(TARGET-stagefeedback-target-libmpx)
 
-maybe-clean-stagefeedback-target-libsanitizer: clean-stagefeedback-target-libsanitizer
-clean-stagefeedback: clean-stagefeedback-target-libsanitizer
-clean-stagefeedback-target-libsanitizer:
+maybe-clean-stagefeedback-target-libmpx: clean-stagefeedback-target-libmpx
+clean-stagefeedback: clean-stagefeedback-target-libmpx
+clean-stagefeedback-target-libmpx:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        else \
-         [ -f $(TARGET_SUBDIR)/stagefeedback-libsanitizer/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libmpx/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       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
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
 
 
 
 
 
 
-.PHONY: check-target-libsanitizer maybe-check-target-libsanitizer
-maybe-check-target-libsanitizer:
-@if target-libsanitizer
-maybe-check-target-libsanitizer: check-target-libsanitizer
+.PHONY: check-target-libmpx maybe-check-target-libmpx
+maybe-check-target-libmpx:
+@if target-libmpx
+maybe-check-target-libmpx: check-target-libmpx
 
-check-target-libsanitizer:
+check-target-libmpx:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(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)
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: install-target-libsanitizer maybe-install-target-libsanitizer
-maybe-install-target-libsanitizer:
-@if target-libsanitizer
-maybe-install-target-libsanitizer: install-target-libsanitizer
+.PHONY: install-target-libmpx maybe-install-target-libmpx
+maybe-install-target-libmpx:
+@if target-libmpx
+maybe-install-target-libmpx: install-target-libmpx
 
-install-target-libsanitizer: installdirs
+install-target-libmpx: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: install-strip-target-libsanitizer maybe-install-strip-target-libsanitizer
-maybe-install-strip-target-libsanitizer:
-@if target-libsanitizer
-maybe-install-strip-target-libsanitizer: install-strip-target-libsanitizer
+.PHONY: install-strip-target-libmpx maybe-install-strip-target-libmpx
+maybe-install-strip-target-libmpx:
+@if target-libmpx
+maybe-install-strip-target-libmpx: install-strip-target-libmpx
 
-install-strip-target-libsanitizer: installdirs
+install-strip-target-libmpx: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libsanitizer
+@endif target-libmpx
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libsanitizer info-target-libsanitizer
-maybe-info-target-libsanitizer:
-@if target-libsanitizer
-maybe-info-target-libsanitizer: info-target-libsanitizer
+.PHONY: maybe-info-target-libmpx info-target-libmpx
+maybe-info-target-libmpx:
+@if target-libmpx
+maybe-info-target-libmpx: info-target-libmpx
 
-info-target-libsanitizer: \
-    configure-target-libsanitizer 
+info-target-libmpx: \
+    configure-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33817,25 +34948,25 @@ info-target-libsanitizer: \
                   info) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: maybe-dvi-target-libsanitizer dvi-target-libsanitizer
-maybe-dvi-target-libsanitizer:
-@if target-libsanitizer
-maybe-dvi-target-libsanitizer: dvi-target-libsanitizer
+.PHONY: maybe-dvi-target-libmpx dvi-target-libmpx
+maybe-dvi-target-libmpx:
+@if target-libmpx
+maybe-dvi-target-libmpx: dvi-target-libmpx
 
-dvi-target-libsanitizer: \
-    configure-target-libsanitizer 
+dvi-target-libmpx: \
+    configure-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33843,25 +34974,25 @@ dvi-target-libsanitizer: \
                   dvi) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: maybe-pdf-target-libsanitizer pdf-target-libsanitizer
-maybe-pdf-target-libsanitizer:
-@if target-libsanitizer
-maybe-pdf-target-libsanitizer: pdf-target-libsanitizer
+.PHONY: maybe-pdf-target-libmpx pdf-target-libmpx
+maybe-pdf-target-libmpx:
+@if target-libmpx
+maybe-pdf-target-libmpx: pdf-target-libmpx
 
-pdf-target-libsanitizer: \
-    configure-target-libsanitizer 
+pdf-target-libmpx: \
+    configure-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33869,25 +35000,25 @@ pdf-target-libsanitizer: \
                   pdf) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: maybe-html-target-libsanitizer html-target-libsanitizer
-maybe-html-target-libsanitizer:
-@if target-libsanitizer
-maybe-html-target-libsanitizer: html-target-libsanitizer
+.PHONY: maybe-html-target-libmpx html-target-libmpx
+maybe-html-target-libmpx:
+@if target-libmpx
+maybe-html-target-libmpx: html-target-libmpx
 
-html-target-libsanitizer: \
-    configure-target-libsanitizer 
+html-target-libmpx: \
+    configure-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33895,25 +35026,25 @@ html-target-libsanitizer: \
                   html) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: maybe-TAGS-target-libsanitizer TAGS-target-libsanitizer
-maybe-TAGS-target-libsanitizer:
-@if target-libsanitizer
-maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer
+.PHONY: maybe-TAGS-target-libmpx TAGS-target-libmpx
+maybe-TAGS-target-libmpx:
+@if target-libmpx
+maybe-TAGS-target-libmpx: TAGS-target-libmpx
 
-TAGS-target-libsanitizer: \
-    configure-target-libsanitizer 
+TAGS-target-libmpx: \
+    configure-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33921,26 +35052,26 @@ TAGS-target-libsanitizer: \
                   TAGS) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: maybe-install-info-target-libsanitizer install-info-target-libsanitizer
-maybe-install-info-target-libsanitizer:
-@if target-libsanitizer
-maybe-install-info-target-libsanitizer: install-info-target-libsanitizer
+.PHONY: maybe-install-info-target-libmpx install-info-target-libmpx
+maybe-install-info-target-libmpx:
+@if target-libmpx
+maybe-install-info-target-libmpx: install-info-target-libmpx
 
-install-info-target-libsanitizer: \
-    configure-target-libsanitizer \
-    info-target-libsanitizer 
+install-info-target-libmpx: \
+    configure-target-libmpx \
+    info-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33948,26 +35079,26 @@ install-info-target-libsanitizer: \
                   install-info) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: maybe-install-pdf-target-libsanitizer install-pdf-target-libsanitizer
-maybe-install-pdf-target-libsanitizer:
-@if target-libsanitizer
-maybe-install-pdf-target-libsanitizer: install-pdf-target-libsanitizer
+.PHONY: maybe-install-pdf-target-libmpx install-pdf-target-libmpx
+maybe-install-pdf-target-libmpx:
+@if target-libmpx
+maybe-install-pdf-target-libmpx: install-pdf-target-libmpx
 
-install-pdf-target-libsanitizer: \
-    configure-target-libsanitizer \
-    pdf-target-libsanitizer 
+install-pdf-target-libmpx: \
+    configure-target-libmpx \
+    pdf-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33975,26 +35106,26 @@ install-pdf-target-libsanitizer: \
                   install-pdf) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: maybe-install-html-target-libsanitizer install-html-target-libsanitizer
-maybe-install-html-target-libsanitizer:
-@if target-libsanitizer
-maybe-install-html-target-libsanitizer: install-html-target-libsanitizer
+.PHONY: maybe-install-html-target-libmpx install-html-target-libmpx
+maybe-install-html-target-libmpx:
+@if target-libmpx
+maybe-install-html-target-libmpx: install-html-target-libmpx
 
-install-html-target-libsanitizer: \
-    configure-target-libsanitizer \
-    html-target-libsanitizer 
+install-html-target-libmpx: \
+    configure-target-libmpx \
+    html-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34002,25 +35133,25 @@ install-html-target-libsanitizer: \
                   install-html) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: maybe-installcheck-target-libsanitizer installcheck-target-libsanitizer
-maybe-installcheck-target-libsanitizer:
-@if target-libsanitizer
-maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer
+.PHONY: maybe-installcheck-target-libmpx installcheck-target-libmpx
+maybe-installcheck-target-libmpx:
+@if target-libmpx
+maybe-installcheck-target-libmpx: installcheck-target-libmpx
 
-installcheck-target-libsanitizer: \
-    configure-target-libsanitizer 
+installcheck-target-libmpx: \
+    configure-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34028,24 +35159,24 @@ installcheck-target-libsanitizer: \
                   installcheck) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: maybe-mostlyclean-target-libsanitizer mostlyclean-target-libsanitizer
-maybe-mostlyclean-target-libsanitizer:
-@if target-libsanitizer
-maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer
+.PHONY: maybe-mostlyclean-target-libmpx mostlyclean-target-libmpx
+maybe-mostlyclean-target-libmpx:
+@if target-libmpx
+maybe-mostlyclean-target-libmpx: mostlyclean-target-libmpx
 
-mostlyclean-target-libsanitizer
+mostlyclean-target-libmpx
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34053,24 +35184,24 @@ mostlyclean-target-libsanitizer:
                   mostlyclean) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: maybe-clean-target-libsanitizer clean-target-libsanitizer
-maybe-clean-target-libsanitizer:
-@if target-libsanitizer
-maybe-clean-target-libsanitizer: clean-target-libsanitizer
+.PHONY: maybe-clean-target-libmpx clean-target-libmpx
+maybe-clean-target-libmpx:
+@if target-libmpx
+maybe-clean-target-libmpx: clean-target-libmpx
 
-clean-target-libsanitizer
+clean-target-libmpx
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34078,24 +35209,24 @@ clean-target-libsanitizer:
                   clean) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: maybe-distclean-target-libsanitizer distclean-target-libsanitizer
-maybe-distclean-target-libsanitizer:
-@if target-libsanitizer
-maybe-distclean-target-libsanitizer: distclean-target-libsanitizer
+.PHONY: maybe-distclean-target-libmpx distclean-target-libmpx
+maybe-distclean-target-libmpx:
+@if target-libmpx
+maybe-distclean-target-libmpx: distclean-target-libmpx
 
-distclean-target-libsanitizer
+distclean-target-libmpx
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34103,24 +35234,24 @@ distclean-target-libsanitizer:
                   distclean) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
-.PHONY: maybe-maintainer-clean-target-libsanitizer maintainer-clean-target-libsanitizer
-maybe-maintainer-clean-target-libsanitizer:
-@if target-libsanitizer
-maybe-maintainer-clean-target-libsanitizer: maintainer-clean-target-libsanitizer
+.PHONY: maybe-maintainer-clean-target-libmpx maintainer-clean-target-libmpx
+maybe-maintainer-clean-target-libmpx:
+@if target-libmpx
+maybe-maintainer-clean-target-libmpx: maintainer-clean-target-libmpx
 
-maintainer-clean-target-libsanitizer
+maintainer-clean-target-libmpx
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libsanitizer" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmpx"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libsanitizer && \
+       (cd $(TARGET_SUBDIR)/libmpx && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -34128,7 +35259,7 @@ maintainer-clean-target-libsanitizer:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libsanitizer
+@endif target-libmpx
 
 
 
@@ -34145,8 +35276,8 @@ configure-target-libvtv:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        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 ; \
+       $(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; \
@@ -34158,7 +35289,7 @@ configure-target-libvtv:
          mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \
        $(RAW_CXX_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libvtv; \
        cd "$(TARGET_SUBDIR)/libvtv" || exit 1; \
@@ -34190,7 +35321,7 @@ configure-stage1-target-libvtv:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
        echo "Checking multilib configuration for libvtv..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       $(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; \
@@ -34206,8 +35337,8 @@ configure-stage1-target-libvtv:
        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)/libvtv ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       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) ;; \
@@ -34234,7 +35365,7 @@ configure-stage2-target-libvtv:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
        echo "Checking multilib configuration for libvtv..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       $(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; \
@@ -34251,8 +35382,8 @@ configure-stage2-target-libvtv:
        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)/libvtv ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       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) ;; \
@@ -34264,7 +35395,7 @@ configure-stage2-target-libvtv:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif target-libvtv-bootstrap
 
@@ -34279,7 +35410,7 @@ configure-stage3-target-libvtv:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
        echo "Checking multilib configuration for libvtv..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       $(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; \
@@ -34296,8 +35427,8 @@ configure-stage3-target-libvtv:
        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)/libvtv ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       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) ;; \
@@ -34309,7 +35440,7 @@ configure-stage3-target-libvtv:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif target-libvtv-bootstrap
 
@@ -34324,7 +35455,7 @@ configure-stage4-target-libvtv:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
        echo "Checking multilib configuration for libvtv..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       $(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; \
@@ -34341,8 +35472,8 @@ configure-stage4-target-libvtv:
        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)/libvtv ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       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) ;; \
@@ -34354,7 +35485,7 @@ configure-stage4-target-libvtv:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif target-libvtv-bootstrap
 
@@ -34369,7 +35500,7 @@ configure-stageprofile-target-libvtv:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
        echo "Checking multilib configuration for libvtv..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       $(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; \
@@ -34386,8 +35517,8 @@ configure-stageprofile-target-libvtv:
        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)/libvtv ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       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) ;; \
@@ -34399,7 +35530,7 @@ configure-stageprofile-target-libvtv:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libvtv-bootstrap
 
@@ -34414,7 +35545,7 @@ configure-stagefeedback-target-libvtv:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        echo "Checking multilib configuration for libvtv..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null ; \
+       $(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; \
@@ -34431,8 +35562,8 @@ configure-stagefeedback-target-libvtv:
        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)/libvtv ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \
+       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) ;; \
@@ -34444,7 +35575,7 @@ configure-stagefeedback-target-libvtv:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libvtv-bootstrap
 
@@ -34777,11 +35908,11 @@ maybe-info-target-libvtv: info-target-libvtv
 info-target-libvtv: \
     configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -34803,11 +35934,11 @@ maybe-dvi-target-libvtv: dvi-target-libvtv
 dvi-target-libvtv: \
     configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -34829,11 +35960,11 @@ maybe-pdf-target-libvtv: pdf-target-libvtv
 pdf-target-libvtv: \
     configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -34855,11 +35986,11 @@ maybe-html-target-libvtv: html-target-libvtv
 html-target-libvtv: \
     configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -34881,11 +36012,11 @@ maybe-TAGS-target-libvtv: TAGS-target-libvtv
 TAGS-target-libvtv: \
     configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -34908,11 +36039,11 @@ install-info-target-libvtv: \
     configure-target-libvtv \
     info-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -34935,11 +36066,11 @@ install-pdf-target-libvtv: \
     configure-target-libvtv \
     pdf-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -34962,11 +36093,11 @@ install-html-target-libvtv: \
     configure-target-libvtv \
     html-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -34988,11 +36119,11 @@ maybe-installcheck-target-libvtv: installcheck-target-libvtv
 installcheck-target-libvtv: \
     configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -35013,11 +36144,11 @@ maybe-mostlyclean-target-libvtv: mostlyclean-target-libvtv
 
 mostlyclean-target-libvtv: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -35038,11 +36169,11 @@ maybe-clean-target-libvtv: clean-target-libvtv
 
 clean-target-libvtv: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -35063,11 +36194,11 @@ maybe-distclean-target-libvtv: distclean-target-libvtv
 
 distclean-target-libvtv: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -35088,11 +36219,11 @@ maybe-maintainer-clean-target-libvtv: maintainer-clean-target-libvtv
 
 maintainer-clean-target-libvtv: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \
+       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; \
@@ -35122,8 +36253,8 @@ configure-target-libcilkrts:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libcilkrts..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libcilkrts/multilib.tmp 2> /dev/null ; \
+       $(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; \
@@ -35135,7 +36266,7 @@ configure-target-libcilkrts:
          mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libcilkrts/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libcilkrts; \
        cd "$(TARGET_SUBDIR)/libcilkrts" || exit 1; \
@@ -35235,11 +36366,11 @@ maybe-info-target-libcilkrts: info-target-libcilkrts
 info-target-libcilkrts: \
     configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35261,11 +36392,11 @@ maybe-dvi-target-libcilkrts: dvi-target-libcilkrts
 dvi-target-libcilkrts: \
     configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35287,11 +36418,11 @@ maybe-pdf-target-libcilkrts: pdf-target-libcilkrts
 pdf-target-libcilkrts: \
     configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35313,11 +36444,11 @@ maybe-html-target-libcilkrts: html-target-libcilkrts
 html-target-libcilkrts: \
     configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35339,11 +36470,11 @@ maybe-TAGS-target-libcilkrts: TAGS-target-libcilkrts
 TAGS-target-libcilkrts: \
     configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35366,11 +36497,11 @@ install-info-target-libcilkrts: \
     configure-target-libcilkrts \
     info-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35393,11 +36524,11 @@ install-pdf-target-libcilkrts: \
     configure-target-libcilkrts \
     pdf-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35420,11 +36551,11 @@ install-html-target-libcilkrts: \
     configure-target-libcilkrts \
     html-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35446,11 +36577,11 @@ maybe-installcheck-target-libcilkrts: installcheck-target-libcilkrts
 installcheck-target-libcilkrts: \
     configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35471,11 +36602,11 @@ maybe-mostlyclean-target-libcilkrts: mostlyclean-target-libcilkrts
 
 mostlyclean-target-libcilkrts: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35496,11 +36627,11 @@ maybe-clean-target-libcilkrts: clean-target-libcilkrts
 
 clean-target-libcilkrts: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35521,11 +36652,11 @@ maybe-distclean-target-libcilkrts: distclean-target-libcilkrts
 
 distclean-target-libcilkrts: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35546,11 +36677,11 @@ maybe-maintainer-clean-target-libcilkrts: maintainer-clean-target-libcilkrts
 
 maintainer-clean-target-libcilkrts: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \
+       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; \
@@ -35568,6 +36699,464 @@ maintainer-clean-target-libcilkrts:
 
 
 
+.PHONY: configure-target-liboffloadmic maybe-configure-target-liboffloadmic
+maybe-configure-target-liboffloadmic:
+@if gcc-bootstrap
+configure-target-liboffloadmic: stage_current
+@endif gcc-bootstrap
+@if target-liboffloadmic
+maybe-configure-target-liboffloadmic: configure-target-liboffloadmic
+configure-target-liboffloadmic: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for liboffloadmic..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/liboffloadmic; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/liboffloadmic/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp $(TARGET_SUBDIR)/liboffloadmic/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/liboffloadmic/Makefile; \
+           mv $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp $(TARGET_SUBDIR)/liboffloadmic/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp $(TARGET_SUBDIR)/liboffloadmic/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/liboffloadmic/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/liboffloadmic; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/liboffloadmic; \
+       cd "$(TARGET_SUBDIR)/liboffloadmic" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/liboffloadmic/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=liboffloadmic; \
+       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} @extra_liboffloadmic_configure_flags@ \
+         || exit 1
+@endif target-liboffloadmic
+
+
+
+
+
+.PHONY: all-target-liboffloadmic maybe-all-target-liboffloadmic
+maybe-all-target-liboffloadmic:
+@if gcc-bootstrap
+all-target-liboffloadmic: stage_current
+@endif gcc-bootstrap
+@if target-liboffloadmic
+TARGET-target-liboffloadmic=all
+maybe-all-target-liboffloadmic: all-target-liboffloadmic
+all-target-liboffloadmic: configure-target-liboffloadmic
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-liboffloadmic))
+@endif target-liboffloadmic
+
+
+
+
+
+.PHONY: check-target-liboffloadmic maybe-check-target-liboffloadmic
+maybe-check-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-check-target-liboffloadmic: check-target-liboffloadmic
+
+check-target-liboffloadmic:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-liboffloadmic
+
+.PHONY: install-target-liboffloadmic maybe-install-target-liboffloadmic
+maybe-install-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-install-target-liboffloadmic: install-target-liboffloadmic
+
+install-target-liboffloadmic: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-liboffloadmic
+
+.PHONY: install-strip-target-liboffloadmic maybe-install-strip-target-liboffloadmic
+maybe-install-strip-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-install-strip-target-liboffloadmic: install-strip-target-liboffloadmic
+
+install-strip-target-liboffloadmic: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-liboffloadmic
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-liboffloadmic info-target-liboffloadmic
+maybe-info-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-info-target-liboffloadmic: info-target-liboffloadmic
+
+info-target-liboffloadmic: \
+    configure-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+.PHONY: maybe-dvi-target-liboffloadmic dvi-target-liboffloadmic
+maybe-dvi-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-dvi-target-liboffloadmic: dvi-target-liboffloadmic
+
+dvi-target-liboffloadmic: \
+    configure-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+.PHONY: maybe-pdf-target-liboffloadmic pdf-target-liboffloadmic
+maybe-pdf-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-pdf-target-liboffloadmic: pdf-target-liboffloadmic
+
+pdf-target-liboffloadmic: \
+    configure-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+.PHONY: maybe-html-target-liboffloadmic html-target-liboffloadmic
+maybe-html-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-html-target-liboffloadmic: html-target-liboffloadmic
+
+html-target-liboffloadmic: \
+    configure-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+.PHONY: maybe-TAGS-target-liboffloadmic TAGS-target-liboffloadmic
+maybe-TAGS-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-TAGS-target-liboffloadmic: TAGS-target-liboffloadmic
+
+TAGS-target-liboffloadmic: \
+    configure-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+.PHONY: maybe-install-info-target-liboffloadmic install-info-target-liboffloadmic
+maybe-install-info-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-install-info-target-liboffloadmic: install-info-target-liboffloadmic
+
+install-info-target-liboffloadmic: \
+    configure-target-liboffloadmic \
+    info-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/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)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+.PHONY: maybe-install-pdf-target-liboffloadmic install-pdf-target-liboffloadmic
+maybe-install-pdf-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-install-pdf-target-liboffloadmic: install-pdf-target-liboffloadmic
+
+install-pdf-target-liboffloadmic: \
+    configure-target-liboffloadmic \
+    pdf-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/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)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+.PHONY: maybe-install-html-target-liboffloadmic install-html-target-liboffloadmic
+maybe-install-html-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-install-html-target-liboffloadmic: install-html-target-liboffloadmic
+
+install-html-target-liboffloadmic: \
+    configure-target-liboffloadmic \
+    html-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/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)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+.PHONY: maybe-installcheck-target-liboffloadmic installcheck-target-liboffloadmic
+maybe-installcheck-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-installcheck-target-liboffloadmic: installcheck-target-liboffloadmic
+
+installcheck-target-liboffloadmic: \
+    configure-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+.PHONY: maybe-mostlyclean-target-liboffloadmic mostlyclean-target-liboffloadmic
+maybe-mostlyclean-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-mostlyclean-target-liboffloadmic: mostlyclean-target-liboffloadmic
+
+mostlyclean-target-liboffloadmic: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+.PHONY: maybe-clean-target-liboffloadmic clean-target-liboffloadmic
+maybe-clean-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-clean-target-liboffloadmic: clean-target-liboffloadmic
+
+clean-target-liboffloadmic: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+.PHONY: maybe-distclean-target-liboffloadmic distclean-target-liboffloadmic
+maybe-distclean-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-distclean-target-liboffloadmic: distclean-target-liboffloadmic
+
+distclean-target-liboffloadmic: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+.PHONY: maybe-maintainer-clean-target-liboffloadmic maintainer-clean-target-liboffloadmic
+maybe-maintainer-clean-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-maintainer-clean-target-liboffloadmic: maintainer-clean-target-liboffloadmic
+
+maintainer-clean-target-liboffloadmic: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/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)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(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-liboffloadmic
+
+
+
+
+
 .PHONY: configure-target-libssp maybe-configure-target-libssp
 maybe-configure-target-libssp:
 @if gcc-bootstrap
@@ -35580,8 +37169,8 @@ configure-target-libssp:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libssp..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libssp/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libssp/multilib.tmp; \
@@ -35593,7 +37182,7 @@ configure-target-libssp:
          mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libssp; \
        cd "$(TARGET_SUBDIR)/libssp" || exit 1; \
@@ -35693,11 +37282,11 @@ maybe-info-target-libssp: info-target-libssp
 info-target-libssp: \
     configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -35719,11 +37308,11 @@ maybe-dvi-target-libssp: dvi-target-libssp
 dvi-target-libssp: \
     configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -35745,11 +37334,11 @@ maybe-pdf-target-libssp: pdf-target-libssp
 pdf-target-libssp: \
     configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -35771,11 +37360,11 @@ maybe-html-target-libssp: html-target-libssp
 html-target-libssp: \
     configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -35797,11 +37386,11 @@ maybe-TAGS-target-libssp: TAGS-target-libssp
 TAGS-target-libssp: \
     configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -35824,11 +37413,11 @@ install-info-target-libssp: \
     configure-target-libssp \
     info-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/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)/libssp" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -35851,11 +37440,11 @@ install-pdf-target-libssp: \
     configure-target-libssp \
     pdf-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/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)/libssp" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -35878,11 +37467,11 @@ install-html-target-libssp: \
     configure-target-libssp \
     html-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/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)/libssp" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -35904,11 +37493,11 @@ maybe-installcheck-target-libssp: installcheck-target-libssp
 installcheck-target-libssp: \
     configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -35929,11 +37518,11 @@ maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
 
 mostlyclean-target-libssp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -35954,11 +37543,11 @@ maybe-clean-target-libssp: clean-target-libssp
 
 clean-target-libssp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -35979,11 +37568,11 @@ maybe-distclean-target-libssp: distclean-target-libssp
 
 distclean-target-libssp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36004,11 +37593,11 @@ maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
 
 maintainer-clean-target-libssp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/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)/libssp" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36038,8 +37627,8 @@ configure-target-newlib:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for newlib..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/newlib/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/newlib/multilib.tmp; \
@@ -36051,7 +37640,7 @@ configure-target-newlib:
          mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/newlib; \
        cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
@@ -36151,11 +37740,11 @@ maybe-info-target-newlib: info-target-newlib
 info-target-newlib: \
     configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36177,11 +37766,11 @@ maybe-dvi-target-newlib: dvi-target-newlib
 dvi-target-newlib: \
     configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36203,11 +37792,11 @@ maybe-pdf-target-newlib: pdf-target-newlib
 pdf-target-newlib: \
     configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36229,11 +37818,11 @@ maybe-html-target-newlib: html-target-newlib
 html-target-newlib: \
     configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36255,11 +37844,11 @@ maybe-TAGS-target-newlib: TAGS-target-newlib
 TAGS-target-newlib: \
     configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36282,11 +37871,11 @@ install-info-target-newlib: \
     configure-target-newlib \
     info-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36309,11 +37898,11 @@ install-pdf-target-newlib: \
     configure-target-newlib \
     pdf-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36336,11 +37925,11 @@ install-html-target-newlib: \
     configure-target-newlib \
     html-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36362,11 +37951,11 @@ maybe-installcheck-target-newlib: installcheck-target-newlib
 installcheck-target-newlib: \
     configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36387,11 +37976,11 @@ maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
 
 mostlyclean-target-newlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36412,11 +38001,11 @@ maybe-clean-target-newlib: clean-target-newlib
 
 clean-target-newlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36437,11 +38026,11 @@ maybe-distclean-target-newlib: distclean-target-newlib
 
 distclean-target-newlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36462,11 +38051,11 @@ maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
 
 maintainer-clean-target-newlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -36495,8 +38084,8 @@ configure-target-libgcc:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libgcc..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
@@ -36508,7 +38097,7 @@ configure-target-libgcc:
          mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libgcc; \
        cd "$(TARGET_SUBDIR)/libgcc" || exit 1; \
@@ -36540,7 +38129,7 @@ configure-stage1-target-libgcc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
        echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
@@ -36556,8 +38145,8 @@ configure-stage1-target-libgcc:
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
        cd $(TARGET_SUBDIR)/libgcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -36584,7 +38173,7 @@ configure-stage2-target-libgcc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
        echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
@@ -36601,8 +38190,8 @@ configure-stage2-target-libgcc:
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
        cd $(TARGET_SUBDIR)/libgcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -36614,7 +38203,7 @@ configure-stage2-target-libgcc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
@@ -36629,7 +38218,7 @@ configure-stage3-target-libgcc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
        echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
@@ -36646,8 +38235,8 @@ configure-stage3-target-libgcc:
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
        cd $(TARGET_SUBDIR)/libgcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -36659,7 +38248,7 @@ configure-stage3-target-libgcc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
@@ -36674,7 +38263,7 @@ configure-stage4-target-libgcc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
        echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
@@ -36691,8 +38280,8 @@ configure-stage4-target-libgcc:
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
        cd $(TARGET_SUBDIR)/libgcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -36704,7 +38293,7 @@ configure-stage4-target-libgcc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
@@ -36719,7 +38308,7 @@ configure-stageprofile-target-libgcc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
        echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
@@ -36736,8 +38325,8 @@ configure-stageprofile-target-libgcc:
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
        cd $(TARGET_SUBDIR)/libgcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -36749,7 +38338,7 @@ configure-stageprofile-target-libgcc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
@@ -36764,7 +38353,7 @@ configure-stagefeedback-target-libgcc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
@@ -36781,8 +38370,8 @@ configure-stagefeedback-target-libgcc:
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
        cd $(TARGET_SUBDIR)/libgcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -36794,7 +38383,7 @@ configure-stagefeedback-target-libgcc:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
@@ -37122,11 +38711,11 @@ maybe-info-target-libgcc: info-target-libgcc
 info-target-libgcc: \
     configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37148,11 +38737,11 @@ maybe-dvi-target-libgcc: dvi-target-libgcc
 dvi-target-libgcc: \
     configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37174,11 +38763,11 @@ maybe-pdf-target-libgcc: pdf-target-libgcc
 pdf-target-libgcc: \
     configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37200,11 +38789,11 @@ maybe-html-target-libgcc: html-target-libgcc
 html-target-libgcc: \
     configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37226,11 +38815,11 @@ maybe-TAGS-target-libgcc: TAGS-target-libgcc
 TAGS-target-libgcc: \
     configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37253,11 +38842,11 @@ install-info-target-libgcc: \
     configure-target-libgcc \
     info-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37280,11 +38869,11 @@ install-pdf-target-libgcc: \
     configure-target-libgcc \
     pdf-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37307,11 +38896,11 @@ install-html-target-libgcc: \
     configure-target-libgcc \
     html-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37333,11 +38922,11 @@ maybe-installcheck-target-libgcc: installcheck-target-libgcc
 installcheck-target-libgcc: \
     configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37358,11 +38947,11 @@ maybe-mostlyclean-target-libgcc: mostlyclean-target-libgcc
 
 mostlyclean-target-libgcc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37383,11 +38972,11 @@ maybe-clean-target-libgcc: clean-target-libgcc
 
 clean-target-libgcc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37408,11 +38997,11 @@ maybe-distclean-target-libgcc: distclean-target-libgcc
 
 distclean-target-libgcc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37433,11 +39022,11 @@ maybe-maintainer-clean-target-libgcc: maintainer-clean-target-libgcc
 
 maintainer-clean-target-libgcc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -37467,8 +39056,8 @@ configure-target-libbacktrace:
        @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 ; \
+       $(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; \
@@ -37480,7 +39069,7 @@ configure-target-libbacktrace:
          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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libbacktrace; \
        cd "$(TARGET_SUBDIR)/libbacktrace" || exit 1; \
@@ -37580,11 +39169,11 @@ maybe-info-target-libbacktrace: info-target-libbacktrace
 info-target-libbacktrace: \
     configure-target-libbacktrace 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37606,11 +39195,11 @@ maybe-dvi-target-libbacktrace: dvi-target-libbacktrace
 dvi-target-libbacktrace: \
     configure-target-libbacktrace 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37632,11 +39221,11 @@ maybe-pdf-target-libbacktrace: pdf-target-libbacktrace
 pdf-target-libbacktrace: \
     configure-target-libbacktrace 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37658,11 +39247,11 @@ maybe-html-target-libbacktrace: html-target-libbacktrace
 html-target-libbacktrace: \
     configure-target-libbacktrace 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37684,11 +39273,11 @@ maybe-TAGS-target-libbacktrace: TAGS-target-libbacktrace
 TAGS-target-libbacktrace: \
     configure-target-libbacktrace 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37711,11 +39300,11 @@ install-info-target-libbacktrace: \
     configure-target-libbacktrace \
     info-target-libbacktrace 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37738,11 +39327,11 @@ install-pdf-target-libbacktrace: \
     configure-target-libbacktrace \
     pdf-target-libbacktrace 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37765,11 +39354,11 @@ install-html-target-libbacktrace: \
     configure-target-libbacktrace \
     html-target-libbacktrace 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37791,11 +39380,11 @@ maybe-installcheck-target-libbacktrace: installcheck-target-libbacktrace
 installcheck-target-libbacktrace: \
     configure-target-libbacktrace 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37816,11 +39405,11 @@ maybe-mostlyclean-target-libbacktrace: mostlyclean-target-libbacktrace
 
 mostlyclean-target-libbacktrace: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37841,11 +39430,11 @@ maybe-clean-target-libbacktrace: clean-target-libbacktrace
 
 clean-target-libbacktrace: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37866,11 +39455,11 @@ maybe-distclean-target-libbacktrace: distclean-target-libbacktrace
 
 distclean-target-libbacktrace: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37891,11 +39480,11 @@ maybe-maintainer-clean-target-libbacktrace: maintainer-clean-target-libbacktrace
 
 maintainer-clean-target-libbacktrace: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -37925,8 +39514,8 @@ configure-target-libquadmath:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libquadmath..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libquadmath/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libquadmath/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libquadmath/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libquadmath/multilib.tmp; \
@@ -37938,7 +39527,7 @@ configure-target-libquadmath:
          mv $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libquadmath/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libquadmath; \
        cd "$(TARGET_SUBDIR)/libquadmath" || exit 1; \
@@ -38038,11 +39627,11 @@ maybe-info-target-libquadmath: info-target-libquadmath
 info-target-libquadmath: \
     configure-target-libquadmath 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libquadmath" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38064,11 +39653,11 @@ maybe-dvi-target-libquadmath: dvi-target-libquadmath
 dvi-target-libquadmath: \
     configure-target-libquadmath 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libquadmath" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38090,11 +39679,11 @@ maybe-pdf-target-libquadmath: pdf-target-libquadmath
 pdf-target-libquadmath: \
     configure-target-libquadmath 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libquadmath" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38116,11 +39705,11 @@ maybe-html-target-libquadmath: html-target-libquadmath
 html-target-libquadmath: \
     configure-target-libquadmath 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libquadmath" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38142,11 +39731,11 @@ maybe-TAGS-target-libquadmath: TAGS-target-libquadmath
 TAGS-target-libquadmath: \
     configure-target-libquadmath 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libquadmath" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38169,11 +39758,11 @@ install-info-target-libquadmath: \
     configure-target-libquadmath \
     info-target-libquadmath 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38196,11 +39785,11 @@ install-pdf-target-libquadmath: \
     configure-target-libquadmath \
     pdf-target-libquadmath 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38223,11 +39812,11 @@ install-html-target-libquadmath: \
     configure-target-libquadmath \
     html-target-libquadmath 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38249,11 +39838,11 @@ maybe-installcheck-target-libquadmath: installcheck-target-libquadmath
 installcheck-target-libquadmath: \
     configure-target-libquadmath 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libquadmath" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38274,11 +39863,11 @@ maybe-mostlyclean-target-libquadmath: mostlyclean-target-libquadmath
 
 mostlyclean-target-libquadmath: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libquadmath" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38299,11 +39888,11 @@ maybe-clean-target-libquadmath: clean-target-libquadmath
 
 clean-target-libquadmath: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libquadmath" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38324,11 +39913,11 @@ maybe-distclean-target-libquadmath: distclean-target-libquadmath
 
 distclean-target-libquadmath: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libquadmath" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38349,11 +39938,11 @@ maybe-maintainer-clean-target-libquadmath: maintainer-clean-target-libquadmath
 
 maintainer-clean-target-libquadmath: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libquadmath"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38383,8 +39972,8 @@ configure-target-libgfortran:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libgfortran..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgfortran/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgfortran/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgfortran/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgfortran/multilib.tmp; \
@@ -38396,7 +39985,7 @@ configure-target-libgfortran:
          mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
        cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
@@ -38496,11 +40085,11 @@ maybe-info-target-libgfortran: info-target-libgfortran
 info-target-libgfortran: \
     configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libgfortran" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38522,11 +40111,11 @@ maybe-dvi-target-libgfortran: dvi-target-libgfortran
 dvi-target-libgfortran: \
     configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38548,11 +40137,11 @@ maybe-pdf-target-libgfortran: pdf-target-libgfortran
 pdf-target-libgfortran: \
     configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libgfortran" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38574,11 +40163,11 @@ maybe-html-target-libgfortran: html-target-libgfortran
 html-target-libgfortran: \
     configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libgfortran" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38600,11 +40189,11 @@ maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
 TAGS-target-libgfortran: \
     configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38627,11 +40216,11 @@ install-info-target-libgfortran: \
     configure-target-libgfortran \
     info-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38654,11 +40243,11 @@ install-pdf-target-libgfortran: \
     configure-target-libgfortran \
     pdf-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38681,11 +40270,11 @@ install-html-target-libgfortran: \
     configure-target-libgfortran \
     html-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38707,11 +40296,11 @@ maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
 installcheck-target-libgfortran: \
     configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38732,11 +40321,11 @@ maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
 
 mostlyclean-target-libgfortran: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38757,11 +40346,11 @@ maybe-clean-target-libgfortran: clean-target-libgfortran
 
 clean-target-libgfortran: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libgfortran" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38782,11 +40371,11 @@ maybe-distclean-target-libgfortran: distclean-target-libgfortran
 
 distclean-target-libgfortran: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38807,11 +40396,11 @@ maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
 
 maintainer-clean-target-libgfortran: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38841,8 +40430,8 @@ configure-target-libobjc:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libobjc..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libobjc/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libobjc/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libobjc/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libobjc/multilib.tmp; \
@@ -38854,7 +40443,7 @@ configure-target-libobjc:
          mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libobjc; \
        cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
@@ -38954,11 +40543,11 @@ maybe-info-target-libobjc: info-target-libobjc
 info-target-libobjc: \
     configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libobjc" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -38980,11 +40569,11 @@ maybe-dvi-target-libobjc: dvi-target-libobjc
 dvi-target-libobjc: \
     configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libobjc" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39006,11 +40595,11 @@ maybe-pdf-target-libobjc: pdf-target-libobjc
 pdf-target-libobjc: \
     configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libobjc" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39032,11 +40621,11 @@ maybe-html-target-libobjc: html-target-libobjc
 html-target-libobjc: \
     configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libobjc" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39058,11 +40647,11 @@ maybe-TAGS-target-libobjc: TAGS-target-libobjc
 TAGS-target-libobjc: \
     configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libobjc" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39085,11 +40674,11 @@ install-info-target-libobjc: \
     configure-target-libobjc \
     info-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39112,11 +40701,11 @@ install-pdf-target-libobjc: \
     configure-target-libobjc \
     pdf-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39139,11 +40728,11 @@ install-html-target-libobjc: \
     configure-target-libobjc \
     html-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39165,11 +40754,11 @@ maybe-installcheck-target-libobjc: installcheck-target-libobjc
 installcheck-target-libobjc: \
     configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libobjc" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39190,11 +40779,11 @@ maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
 
 mostlyclean-target-libobjc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libobjc" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39215,11 +40804,11 @@ maybe-clean-target-libobjc: clean-target-libobjc
 
 clean-target-libobjc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libobjc" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39240,11 +40829,11 @@ maybe-distclean-target-libobjc: distclean-target-libobjc
 
 distclean-target-libobjc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libobjc" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39265,11 +40854,11 @@ maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
 
 maintainer-clean-target-libobjc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libobjc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39299,8 +40888,8 @@ configure-target-libgo:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libgo..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgo/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgo/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgo/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgo/multilib.tmp; \
@@ -39312,7 +40901,7 @@ configure-target-libgo:
          mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libgo/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libgo; \
        cd "$(TARGET_SUBDIR)/libgo" || exit 1; \
@@ -39412,11 +41001,11 @@ maybe-info-target-libgo: info-target-libgo
 info-target-libgo: \
     configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39438,11 +41027,11 @@ maybe-dvi-target-libgo: dvi-target-libgo
 dvi-target-libgo: \
     configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39464,11 +41053,11 @@ maybe-pdf-target-libgo: pdf-target-libgo
 pdf-target-libgo: \
     configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39490,11 +41079,11 @@ maybe-html-target-libgo: html-target-libgo
 html-target-libgo: \
     configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39516,11 +41105,11 @@ maybe-TAGS-target-libgo: TAGS-target-libgo
 TAGS-target-libgo: \
     configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39543,11 +41132,11 @@ install-info-target-libgo: \
     configure-target-libgo \
     info-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39570,11 +41159,11 @@ install-pdf-target-libgo: \
     configure-target-libgo \
     pdf-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39597,11 +41186,11 @@ install-html-target-libgo: \
     configure-target-libgo \
     html-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39623,11 +41212,11 @@ maybe-installcheck-target-libgo: installcheck-target-libgo
 installcheck-target-libgo: \
     configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39648,11 +41237,11 @@ maybe-mostlyclean-target-libgo: mostlyclean-target-libgo
 
 mostlyclean-target-libgo: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39673,11 +41262,11 @@ maybe-clean-target-libgo: clean-target-libgo
 
 clean-target-libgo: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39698,11 +41287,11 @@ maybe-distclean-target-libgo: distclean-target-libgo
 
 distclean-target-libgo: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39723,11 +41312,11 @@ maybe-maintainer-clean-target-libgo: maintainer-clean-target-libgo
 
 maintainer-clean-target-libgo: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgo"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39757,8 +41346,8 @@ configure-target-libtermcap:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libtermcap..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libtermcap/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libtermcap/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libtermcap/multilib.tmp; \
@@ -39770,7 +41359,7 @@ configure-target-libtermcap:
          mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
        cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
@@ -39865,11 +41454,11 @@ maybe-info-target-libtermcap: info-target-libtermcap
 info-target-libtermcap: \
     configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libtermcap" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libtermcap"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39891,11 +41480,11 @@ maybe-dvi-target-libtermcap: dvi-target-libtermcap
 dvi-target-libtermcap: \
     configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39917,11 +41506,11 @@ maybe-pdf-target-libtermcap: pdf-target-libtermcap
 pdf-target-libtermcap: \
     configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libtermcap" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libtermcap"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39943,11 +41532,11 @@ maybe-html-target-libtermcap: html-target-libtermcap
 html-target-libtermcap: \
     configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libtermcap" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libtermcap"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39969,11 +41558,11 @@ maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
 TAGS-target-libtermcap: \
     configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -39996,11 +41585,11 @@ install-info-target-libtermcap: \
     configure-target-libtermcap \
     info-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libtermcap"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40023,11 +41612,11 @@ install-pdf-target-libtermcap: \
     configure-target-libtermcap \
     pdf-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libtermcap"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40050,11 +41639,11 @@ install-html-target-libtermcap: \
     configure-target-libtermcap \
     html-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libtermcap"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40076,11 +41665,11 @@ maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
 installcheck-target-libtermcap: \
     configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40150,8 +41739,8 @@ configure-target-winsup:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for winsup..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/winsup/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/winsup/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/winsup/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/winsup/multilib.tmp; \
@@ -40163,7 +41752,7 @@ configure-target-winsup:
          mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/winsup; \
        cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
@@ -40263,11 +41852,11 @@ maybe-info-target-winsup: info-target-winsup
 info-target-winsup: \
     configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40289,11 +41878,11 @@ maybe-dvi-target-winsup: dvi-target-winsup
 dvi-target-winsup: \
     configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40315,11 +41904,11 @@ maybe-pdf-target-winsup: pdf-target-winsup
 pdf-target-winsup: \
     configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40341,11 +41930,11 @@ maybe-html-target-winsup: html-target-winsup
 html-target-winsup: \
     configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40367,11 +41956,11 @@ maybe-TAGS-target-winsup: TAGS-target-winsup
 TAGS-target-winsup: \
     configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40394,11 +41983,11 @@ install-info-target-winsup: \
     configure-target-winsup \
     info-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40421,11 +42010,11 @@ install-pdf-target-winsup: \
     configure-target-winsup \
     pdf-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40448,11 +42037,11 @@ install-html-target-winsup: \
     configure-target-winsup \
     html-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40474,11 +42063,11 @@ maybe-installcheck-target-winsup: installcheck-target-winsup
 installcheck-target-winsup: \
     configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40499,11 +42088,11 @@ maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
 
 mostlyclean-target-winsup: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40524,11 +42113,11 @@ maybe-clean-target-winsup: clean-target-winsup
 
 clean-target-winsup: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40549,11 +42138,11 @@ maybe-distclean-target-winsup: distclean-target-winsup
 
 distclean-target-winsup: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40574,11 +42163,11 @@ maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup
 
 maintainer-clean-target-winsup: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/winsup"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40608,8 +42197,8 @@ configure-target-libgloss:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libgloss..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgloss/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgloss/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgloss/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgloss/multilib.tmp; \
@@ -40621,7 +42210,7 @@ configure-target-libgloss:
          mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libgloss; \
        cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
@@ -40716,11 +42305,11 @@ maybe-info-target-libgloss: info-target-libgloss
 info-target-libgloss: \
     configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40742,11 +42331,11 @@ maybe-dvi-target-libgloss: dvi-target-libgloss
 dvi-target-libgloss: \
     configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40768,11 +42357,11 @@ maybe-pdf-target-libgloss: pdf-target-libgloss
 pdf-target-libgloss: \
     configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40794,11 +42383,11 @@ maybe-html-target-libgloss: html-target-libgloss
 html-target-libgloss: \
     configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40820,11 +42409,11 @@ maybe-TAGS-target-libgloss: TAGS-target-libgloss
 TAGS-target-libgloss: \
     configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40847,11 +42436,11 @@ install-info-target-libgloss: \
     configure-target-libgloss \
     info-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40874,11 +42463,11 @@ install-pdf-target-libgloss: \
     configure-target-libgloss \
     pdf-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40901,11 +42490,11 @@ install-html-target-libgloss: \
     configure-target-libgloss \
     html-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40927,11 +42516,11 @@ maybe-installcheck-target-libgloss: installcheck-target-libgloss
 installcheck-target-libgloss: \
     configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40952,11 +42541,11 @@ maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
 
 mostlyclean-target-libgloss: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -40977,11 +42566,11 @@ maybe-clean-target-libgloss: clean-target-libgloss
 
 clean-target-libgloss: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41002,11 +42591,11 @@ maybe-distclean-target-libgloss: distclean-target-libgloss
 
 distclean-target-libgloss: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41027,11 +42616,11 @@ maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss
 
 maintainer-clean-target-libgloss: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgloss"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41061,8 +42650,8 @@ configure-target-libffi:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libffi..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \
@@ -41074,7 +42663,7 @@ configure-target-libffi:
          mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libffi; \
        cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
@@ -41164,11 +42753,11 @@ maybe-info-target-libffi: info-target-libffi
 info-target-libffi: \
     configure-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41190,11 +42779,11 @@ maybe-dvi-target-libffi: dvi-target-libffi
 dvi-target-libffi: \
     configure-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41216,11 +42805,11 @@ maybe-pdf-target-libffi: pdf-target-libffi
 pdf-target-libffi: \
     configure-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41242,11 +42831,11 @@ maybe-html-target-libffi: html-target-libffi
 html-target-libffi: \
     configure-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41268,11 +42857,11 @@ maybe-TAGS-target-libffi: TAGS-target-libffi
 TAGS-target-libffi: \
     configure-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41295,11 +42884,11 @@ install-info-target-libffi: \
     configure-target-libffi \
     info-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41322,11 +42911,11 @@ install-pdf-target-libffi: \
     configure-target-libffi \
     pdf-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41349,11 +42938,11 @@ install-html-target-libffi: \
     configure-target-libffi \
     html-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41375,11 +42964,11 @@ maybe-installcheck-target-libffi: installcheck-target-libffi
 installcheck-target-libffi: \
     configure-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41400,11 +42989,11 @@ maybe-mostlyclean-target-libffi: mostlyclean-target-libffi
 
 mostlyclean-target-libffi: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41425,11 +43014,11 @@ maybe-clean-target-libffi: clean-target-libffi
 
 clean-target-libffi: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41450,11 +43039,11 @@ maybe-distclean-target-libffi: distclean-target-libffi
 
 distclean-target-libffi: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41475,11 +43064,11 @@ maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi
 
 maintainer-clean-target-libffi: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41509,8 +43098,8 @@ configure-target-libjava:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libjava..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libjava/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libjava/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libjava/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libjava/multilib.tmp; \
@@ -41522,7 +43111,7 @@ configure-target-libjava:
          mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava; \
        $(RAW_CXX_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libjava; \
        cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
@@ -41622,11 +43211,11 @@ maybe-info-target-libjava: info-target-libjava
 info-target-libjava: \
     configure-target-libjava 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41648,11 +43237,11 @@ maybe-dvi-target-libjava: dvi-target-libjava
 dvi-target-libjava: \
     configure-target-libjava 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41674,11 +43263,11 @@ maybe-pdf-target-libjava: pdf-target-libjava
 pdf-target-libjava: \
     configure-target-libjava 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41700,11 +43289,11 @@ maybe-html-target-libjava: html-target-libjava
 html-target-libjava: \
     configure-target-libjava 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41726,11 +43315,11 @@ maybe-TAGS-target-libjava: TAGS-target-libjava
 TAGS-target-libjava: \
     configure-target-libjava 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41753,11 +43342,11 @@ install-info-target-libjava: \
     configure-target-libjava \
     info-target-libjava 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41780,11 +43369,11 @@ install-pdf-target-libjava: \
     configure-target-libjava \
     pdf-target-libjava 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41807,11 +43396,11 @@ install-html-target-libjava: \
     configure-target-libjava \
     html-target-libjava 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41833,11 +43422,11 @@ maybe-installcheck-target-libjava: installcheck-target-libjava
 installcheck-target-libjava: \
     configure-target-libjava 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41858,11 +43447,11 @@ maybe-mostlyclean-target-libjava: mostlyclean-target-libjava
 
 mostlyclean-target-libjava: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41883,11 +43472,11 @@ maybe-clean-target-libjava: clean-target-libjava
 
 clean-target-libjava: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41908,11 +43497,11 @@ maybe-distclean-target-libjava: distclean-target-libjava
 
 distclean-target-libjava: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41933,11 +43522,11 @@ maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava
 
 maintainer-clean-target-libjava: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libjava/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)/libjava" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libjava"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41967,8 +43556,8 @@ configure-target-zlib:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for zlib..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/zlib/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/zlib/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/zlib/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/zlib/multilib.tmp; \
@@ -41980,7 +43569,7 @@ configure-target-zlib:
          mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/zlib; \
        cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
@@ -42080,11 +43669,11 @@ maybe-info-target-zlib: info-target-zlib
 info-target-zlib: \
     configure-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/zlib" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42106,11 +43695,11 @@ maybe-dvi-target-zlib: dvi-target-zlib
 dvi-target-zlib: \
     configure-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/zlib" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42132,11 +43721,11 @@ maybe-pdf-target-zlib: pdf-target-zlib
 pdf-target-zlib: \
     configure-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/zlib" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42158,11 +43747,11 @@ maybe-html-target-zlib: html-target-zlib
 html-target-zlib: \
     configure-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/zlib" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42184,11 +43773,11 @@ maybe-TAGS-target-zlib: TAGS-target-zlib
 TAGS-target-zlib: \
     configure-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/zlib" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42211,11 +43800,11 @@ install-info-target-zlib: \
     configure-target-zlib \
     info-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42238,11 +43827,11 @@ install-pdf-target-zlib: \
     configure-target-zlib \
     pdf-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42265,11 +43854,11 @@ install-html-target-zlib: \
     configure-target-zlib \
     html-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42291,11 +43880,11 @@ maybe-installcheck-target-zlib: installcheck-target-zlib
 installcheck-target-zlib: \
     configure-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/zlib" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42316,11 +43905,11 @@ maybe-mostlyclean-target-zlib: mostlyclean-target-zlib
 
 mostlyclean-target-zlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/zlib" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42341,11 +43930,11 @@ maybe-clean-target-zlib: clean-target-zlib
 
 clean-target-zlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/zlib" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42366,11 +43955,11 @@ maybe-distclean-target-zlib: distclean-target-zlib
 
 distclean-target-zlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/zlib" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42391,11 +43980,11 @@ maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib
 
 maintainer-clean-target-zlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/zlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42425,8 +44014,8 @@ configure-target-boehm-gc:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for boehm-gc..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/boehm-gc/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/boehm-gc/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/boehm-gc/multilib.tmp; \
@@ -42438,7 +44027,7 @@ configure-target-boehm-gc:
          mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
        cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
@@ -42538,11 +44127,11 @@ maybe-info-target-boehm-gc: info-target-boehm-gc
 info-target-boehm-gc: \
     configure-target-boehm-gc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/boehm-gc" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42564,11 +44153,11 @@ maybe-dvi-target-boehm-gc: dvi-target-boehm-gc
 dvi-target-boehm-gc: \
     configure-target-boehm-gc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42590,11 +44179,11 @@ maybe-pdf-target-boehm-gc: pdf-target-boehm-gc
 pdf-target-boehm-gc: \
     configure-target-boehm-gc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/boehm-gc" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42616,11 +44205,11 @@ maybe-html-target-boehm-gc: html-target-boehm-gc
 html-target-boehm-gc: \
     configure-target-boehm-gc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/boehm-gc" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42642,11 +44231,11 @@ maybe-TAGS-target-boehm-gc: TAGS-target-boehm-gc
 TAGS-target-boehm-gc: \
     configure-target-boehm-gc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42669,11 +44258,11 @@ install-info-target-boehm-gc: \
     configure-target-boehm-gc \
     info-target-boehm-gc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42696,11 +44285,11 @@ install-pdf-target-boehm-gc: \
     configure-target-boehm-gc \
     pdf-target-boehm-gc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42723,11 +44312,11 @@ install-html-target-boehm-gc: \
     configure-target-boehm-gc \
     html-target-boehm-gc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42749,11 +44338,11 @@ maybe-installcheck-target-boehm-gc: installcheck-target-boehm-gc
 installcheck-target-boehm-gc: \
     configure-target-boehm-gc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42774,11 +44363,11 @@ maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc
 
 mostlyclean-target-boehm-gc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42799,11 +44388,11 @@ maybe-clean-target-boehm-gc: clean-target-boehm-gc
 
 clean-target-boehm-gc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42824,11 +44413,11 @@ maybe-distclean-target-boehm-gc: distclean-target-boehm-gc
 
 distclean-target-boehm-gc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/boehm-gc" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42849,11 +44438,11 @@ maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc
 
 maintainer-clean-target-boehm-gc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/boehm-gc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42883,8 +44472,8 @@ configure-target-rda:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for rda..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/rda/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/rda/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/rda/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/rda/multilib.tmp; \
@@ -42896,7 +44485,7 @@ configure-target-rda:
          mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/rda; \
        cd "$(TARGET_SUBDIR)/rda" || exit 1; \
@@ -42996,11 +44585,11 @@ maybe-info-target-rda: info-target-rda
 info-target-rda: \
     configure-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/rda" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43022,11 +44611,11 @@ maybe-dvi-target-rda: dvi-target-rda
 dvi-target-rda: \
     configure-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/rda" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43048,11 +44637,11 @@ maybe-pdf-target-rda: pdf-target-rda
 pdf-target-rda: \
     configure-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/rda" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43074,11 +44663,11 @@ maybe-html-target-rda: html-target-rda
 html-target-rda: \
     configure-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/rda" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43100,11 +44689,11 @@ maybe-TAGS-target-rda: TAGS-target-rda
 TAGS-target-rda: \
     configure-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/rda" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43127,11 +44716,11 @@ install-info-target-rda: \
     configure-target-rda \
     info-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43154,11 +44743,11 @@ install-pdf-target-rda: \
     configure-target-rda \
     pdf-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43181,11 +44770,11 @@ install-html-target-rda: \
     configure-target-rda \
     html-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43207,11 +44796,11 @@ maybe-installcheck-target-rda: installcheck-target-rda
 installcheck-target-rda: \
     configure-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/rda" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43232,11 +44821,11 @@ maybe-mostlyclean-target-rda: mostlyclean-target-rda
 
 mostlyclean-target-rda: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/rda" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43257,11 +44846,11 @@ maybe-clean-target-rda: clean-target-rda
 
 clean-target-rda: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/rda" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43282,11 +44871,11 @@ maybe-distclean-target-rda: distclean-target-rda
 
 distclean-target-rda: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/rda" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43307,11 +44896,11 @@ maybe-maintainer-clean-target-rda: maintainer-clean-target-rda
 
 maintainer-clean-target-rda: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/rda"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43341,8 +44930,8 @@ configure-target-libada:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libada..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libada/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libada/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libada/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libada/multilib.tmp; \
@@ -43354,7 +44943,7 @@ configure-target-libada:
          mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libada; \
        cd "$(TARGET_SUBDIR)/libada" || exit 1; \
@@ -43454,11 +45043,11 @@ maybe-info-target-libada: info-target-libada
 info-target-libada: \
     configure-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libada" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43480,11 +45069,11 @@ maybe-dvi-target-libada: dvi-target-libada
 dvi-target-libada: \
     configure-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43506,11 +45095,11 @@ maybe-pdf-target-libada: pdf-target-libada
 pdf-target-libada: \
     configure-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libada" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43532,11 +45121,11 @@ maybe-html-target-libada: html-target-libada
 html-target-libada: \
     configure-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libada" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43558,11 +45147,11 @@ maybe-TAGS-target-libada: TAGS-target-libada
 TAGS-target-libada: \
     configure-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43585,11 +45174,11 @@ install-info-target-libada: \
     configure-target-libada \
     info-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43612,11 +45201,11 @@ install-pdf-target-libada: \
     configure-target-libada \
     pdf-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43639,11 +45228,11 @@ install-html-target-libada: \
     configure-target-libada \
     html-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43665,11 +45254,11 @@ maybe-installcheck-target-libada: installcheck-target-libada
 installcheck-target-libada: \
     configure-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43690,11 +45279,11 @@ maybe-mostlyclean-target-libada: mostlyclean-target-libada
 
 mostlyclean-target-libada: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43715,11 +45304,11 @@ maybe-clean-target-libada: clean-target-libada
 
 clean-target-libada: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libada" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43740,11 +45329,11 @@ maybe-distclean-target-libada: distclean-target-libada
 
 distclean-target-libada: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libada" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43765,11 +45354,11 @@ maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
 
 maintainer-clean-target-libada: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43798,8 +45387,8 @@ configure-target-libgomp:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libgomp..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
@@ -43811,7 +45400,7 @@ configure-target-libgomp:
          mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libgomp; \
        cd "$(TARGET_SUBDIR)/libgomp" || exit 1; \
@@ -43843,7 +45432,7 @@ configure-stage1-target-libgomp:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
        echo "Checking multilib configuration for libgomp..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
@@ -43859,8 +45448,8 @@ configure-stage1-target-libgomp:
        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)/libgomp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libgomp; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \
        cd $(TARGET_SUBDIR)/libgomp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -43887,7 +45476,7 @@ configure-stage2-target-libgomp:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
        echo "Checking multilib configuration for libgomp..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
@@ -43904,8 +45493,8 @@ configure-stage2-target-libgomp:
        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)/libgomp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libgomp; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \
        cd $(TARGET_SUBDIR)/libgomp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -43917,7 +45506,7 @@ configure-stage2-target-libgomp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
@@ -43932,7 +45521,7 @@ configure-stage3-target-libgomp:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
        echo "Checking multilib configuration for libgomp..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
@@ -43949,8 +45538,8 @@ configure-stage3-target-libgomp:
        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)/libgomp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libgomp; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \
        cd $(TARGET_SUBDIR)/libgomp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -43962,7 +45551,7 @@ configure-stage3-target-libgomp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
@@ -43977,7 +45566,7 @@ configure-stage4-target-libgomp:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
        echo "Checking multilib configuration for libgomp..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
@@ -43994,8 +45583,8 @@ configure-stage4-target-libgomp:
        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)/libgomp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libgomp; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \
        cd $(TARGET_SUBDIR)/libgomp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -44007,7 +45596,7 @@ configure-stage4-target-libgomp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
@@ -44022,7 +45611,7 @@ configure-stageprofile-target-libgomp:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
        echo "Checking multilib configuration for libgomp..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
@@ -44039,8 +45628,8 @@ configure-stageprofile-target-libgomp:
        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)/libgomp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libgomp; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \
        cd $(TARGET_SUBDIR)/libgomp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -44052,7 +45641,7 @@ configure-stageprofile-target-libgomp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
@@ -44067,7 +45656,7 @@ configure-stagefeedback-target-libgomp:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        echo "Checking multilib configuration for libgomp..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
@@ -44084,8 +45673,8 @@ configure-stagefeedback-target-libgomp:
        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)/libgomp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libgomp; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \
        cd $(TARGET_SUBDIR)/libgomp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -44097,7 +45686,7 @@ configure-stagefeedback-target-libgomp:
          --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
@@ -44430,11 +46019,11 @@ maybe-info-target-libgomp: info-target-libgomp
 info-target-libgomp: \
     configure-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libgomp" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44456,11 +46045,11 @@ maybe-dvi-target-libgomp: dvi-target-libgomp
 dvi-target-libgomp: \
     configure-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libgomp" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44482,11 +46071,11 @@ maybe-pdf-target-libgomp: pdf-target-libgomp
 pdf-target-libgomp: \
     configure-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libgomp" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44508,11 +46097,11 @@ maybe-html-target-libgomp: html-target-libgomp
 html-target-libgomp: \
     configure-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libgomp" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44534,11 +46123,11 @@ maybe-TAGS-target-libgomp: TAGS-target-libgomp
 TAGS-target-libgomp: \
     configure-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libgomp" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44561,11 +46150,11 @@ install-info-target-libgomp: \
     configure-target-libgomp \
     info-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44588,11 +46177,11 @@ install-pdf-target-libgomp: \
     configure-target-libgomp \
     pdf-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44615,11 +46204,11 @@ install-html-target-libgomp: \
     configure-target-libgomp \
     html-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44641,11 +46230,11 @@ maybe-installcheck-target-libgomp: installcheck-target-libgomp
 installcheck-target-libgomp: \
     configure-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libgomp" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44666,11 +46255,11 @@ maybe-mostlyclean-target-libgomp: mostlyclean-target-libgomp
 
 mostlyclean-target-libgomp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgomp" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44691,11 +46280,11 @@ maybe-clean-target-libgomp: clean-target-libgomp
 
 clean-target-libgomp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libgomp" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44716,11 +46305,11 @@ maybe-distclean-target-libgomp: distclean-target-libgomp
 
 distclean-target-libgomp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libgomp" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44741,11 +46330,11 @@ maybe-maintainer-clean-target-libgomp: maintainer-clean-target-libgomp
 
 maintainer-clean-target-libgomp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgomp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44775,8 +46364,8 @@ configure-target-libitm:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libitm..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libitm ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libitm/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libitm; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libitm/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libitm/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libitm/multilib.tmp $(TARGET_SUBDIR)/libitm/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libitm/multilib.tmp; \
@@ -44788,7 +46377,7 @@ configure-target-libitm:
          mv $(TARGET_SUBDIR)/libitm/multilib.tmp $(TARGET_SUBDIR)/libitm/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libitm/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libitm ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libitm; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libitm; \
        cd "$(TARGET_SUBDIR)/libitm" || exit 1; \
@@ -44888,11 +46477,11 @@ maybe-info-target-libitm: info-target-libitm
 info-target-libitm: \
     configure-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libitm" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44914,11 +46503,11 @@ maybe-dvi-target-libitm: dvi-target-libitm
 dvi-target-libitm: \
     configure-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libitm" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44940,11 +46529,11 @@ maybe-pdf-target-libitm: pdf-target-libitm
 pdf-target-libitm: \
     configure-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libitm" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44966,11 +46555,11 @@ maybe-html-target-libitm: html-target-libitm
 html-target-libitm: \
     configure-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libitm" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -44992,11 +46581,11 @@ maybe-TAGS-target-libitm: TAGS-target-libitm
 TAGS-target-libitm: \
     configure-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libitm" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45019,11 +46608,11 @@ install-info-target-libitm: \
     configure-target-libitm \
     info-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/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)/libitm" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45046,11 +46635,11 @@ install-pdf-target-libitm: \
     configure-target-libitm \
     pdf-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/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)/libitm" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45073,11 +46662,11 @@ install-html-target-libitm: \
     configure-target-libitm \
     html-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/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)/libitm" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45099,11 +46688,11 @@ maybe-installcheck-target-libitm: installcheck-target-libitm
 installcheck-target-libitm: \
     configure-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libitm" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45124,11 +46713,11 @@ maybe-mostlyclean-target-libitm: mostlyclean-target-libitm
 
 mostlyclean-target-libitm: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libitm" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45149,11 +46738,11 @@ maybe-clean-target-libitm: clean-target-libitm
 
 clean-target-libitm: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libitm" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45174,11 +46763,11 @@ maybe-distclean-target-libitm: distclean-target-libitm
 
 distclean-target-libitm: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libitm" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45199,11 +46788,11 @@ maybe-maintainer-clean-target-libitm: maintainer-clean-target-libitm
 
 maintainer-clean-target-libitm: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libitm/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)/libitm" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libitm"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45233,8 +46822,8 @@ configure-target-libatomic:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libatomic..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libatomic/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libatomic/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libatomic/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libatomic/multilib.tmp; \
@@ -45246,7 +46835,7 @@ configure-target-libatomic:
          mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libatomic/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \
        $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libatomic; \
        cd "$(TARGET_SUBDIR)/libatomic" || exit 1; \
@@ -45346,11 +46935,11 @@ maybe-info-target-libatomic: info-target-libatomic
 info-target-libatomic: \
     configure-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libatomic" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45372,11 +46961,11 @@ maybe-dvi-target-libatomic: dvi-target-libatomic
 dvi-target-libatomic: \
     configure-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libatomic" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45398,11 +46987,11 @@ maybe-pdf-target-libatomic: pdf-target-libatomic
 pdf-target-libatomic: \
     configure-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libatomic" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45424,11 +47013,11 @@ maybe-html-target-libatomic: html-target-libatomic
 html-target-libatomic: \
     configure-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libatomic" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45450,11 +47039,11 @@ maybe-TAGS-target-libatomic: TAGS-target-libatomic
 TAGS-target-libatomic: \
     configure-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libatomic" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45477,11 +47066,11 @@ install-info-target-libatomic: \
     configure-target-libatomic \
     info-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/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)/libatomic" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45504,11 +47093,11 @@ install-pdf-target-libatomic: \
     configure-target-libatomic \
     pdf-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/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)/libatomic" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45531,11 +47120,11 @@ install-html-target-libatomic: \
     configure-target-libatomic \
     html-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/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)/libatomic" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45557,11 +47146,11 @@ maybe-installcheck-target-libatomic: installcheck-target-libatomic
 installcheck-target-libatomic: \
     configure-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libatomic" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45582,11 +47171,11 @@ maybe-mostlyclean-target-libatomic: mostlyclean-target-libatomic
 
 mostlyclean-target-libatomic: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libatomic" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45607,11 +47196,11 @@ maybe-clean-target-libatomic: clean-target-libatomic
 
 clean-target-libatomic: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libatomic" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45632,11 +47221,11 @@ maybe-distclean-target-libatomic: distclean-target-libatomic
 
 distclean-target-libatomic: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libatomic" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45657,11 +47246,11 @@ maybe-maintainer-clean-target-libatomic: maintainer-clean-target-libatomic
 
 maintainer-clean-target-libatomic: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libatomic/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)/libatomic" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libatomic"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -45704,7 +47293,7 @@ cross: all-build all-gas all-ld
        echo "Building the C and C++ compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
        @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Building runtime libraries"; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
 @endif gcc-no-bootstrap
@@ -45844,236 +47433,226 @@ objext = .o
 
 stage1-start::
        @: $(MAKE); $(stage); \
-       echo stage1 > stage_current ; \
+       echo stage1 > stage_current; \
        echo stage1 > stage_last; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
 @if bfd
        @cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \
          mkdir stage1-bfd; \
-       mv stage1-bfd bfd 
+       mv stage1-bfd bfd
 @endif bfd
 @if opcodes
        @cd $(HOST_SUBDIR); [ -d stage1-opcodes ] || \
          mkdir stage1-opcodes; \
-       mv stage1-opcodes opcodes 
+       mv stage1-opcodes opcodes
 @endif opcodes
 @if binutils
        @cd $(HOST_SUBDIR); [ -d stage1-binutils ] || \
          mkdir stage1-binutils; \
-       mv stage1-binutils binutils 
+       mv stage1-binutils binutils
 @endif binutils
 @if fixincludes
        @cd $(HOST_SUBDIR); [ -d stage1-fixincludes ] || \
          mkdir stage1-fixincludes; \
-       mv stage1-fixincludes fixincludes 
+       mv stage1-fixincludes fixincludes
 @endif fixincludes
 @if gas
        @cd $(HOST_SUBDIR); [ -d stage1-gas ] || \
          mkdir stage1-gas; \
-       mv stage1-gas gas 
+       mv stage1-gas gas
 @endif gas
 @if gcc
        @cd $(HOST_SUBDIR); [ -d stage1-gcc ] || \
          mkdir stage1-gcc; \
-       mv stage1-gcc gcc 
+       mv stage1-gcc gcc
 @endif gcc
 @if gmp
        @cd $(HOST_SUBDIR); [ -d stage1-gmp ] || \
          mkdir stage1-gmp; \
-       mv stage1-gmp gmp 
+       mv stage1-gmp gmp
 @endif gmp
 @if mpfr
        @cd $(HOST_SUBDIR); [ -d stage1-mpfr ] || \
          mkdir stage1-mpfr; \
-       mv stage1-mpfr mpfr 
+       mv stage1-mpfr mpfr
 @endif mpfr
 @if mpc
        @cd $(HOST_SUBDIR); [ -d stage1-mpc ] || \
          mkdir stage1-mpc; \
-       mv stage1-mpc mpc 
+       mv stage1-mpc mpc
 @endif mpc
 @if isl
        @cd $(HOST_SUBDIR); [ -d stage1-isl ] || \
          mkdir stage1-isl; \
-       mv stage1-isl isl 
+       mv stage1-isl isl
 @endif isl
-@if cloog
-       @cd $(HOST_SUBDIR); [ -d stage1-cloog ] || \
-         mkdir stage1-cloog; \
-       mv stage1-cloog cloog 
-@endif cloog
 @if libelf
        @cd $(HOST_SUBDIR); [ -d stage1-libelf ] || \
          mkdir stage1-libelf; \
-       mv stage1-libelf libelf 
+       mv stage1-libelf libelf
 @endif libelf
 @if gold
        @cd $(HOST_SUBDIR); [ -d stage1-gold ] || \
          mkdir stage1-gold; \
-       mv stage1-gold gold 
+       mv stage1-gold gold
 @endif gold
 @if intl
        @cd $(HOST_SUBDIR); [ -d stage1-intl ] || \
          mkdir stage1-intl; \
-       mv stage1-intl intl 
+       mv stage1-intl intl
 @endif intl
 @if ld
        @cd $(HOST_SUBDIR); [ -d stage1-ld ] || \
          mkdir stage1-ld; \
-       mv stage1-ld ld 
+       mv stage1-ld ld
 @endif ld
 @if libbacktrace
        @cd $(HOST_SUBDIR); [ -d stage1-libbacktrace ] || \
          mkdir stage1-libbacktrace; \
-       mv stage1-libbacktrace libbacktrace 
+       mv stage1-libbacktrace libbacktrace
 @endif libbacktrace
 @if libcpp
        @cd $(HOST_SUBDIR); [ -d stage1-libcpp ] || \
          mkdir stage1-libcpp; \
-       mv stage1-libcpp libcpp 
+       mv stage1-libcpp libcpp
 @endif libcpp
 @if libdecnumber
        @cd $(HOST_SUBDIR); [ -d stage1-libdecnumber ] || \
          mkdir stage1-libdecnumber; \
-       mv stage1-libdecnumber libdecnumber 
+       mv stage1-libdecnumber libdecnumber
 @endif libdecnumber
 @if libiberty
        @cd $(HOST_SUBDIR); [ -d stage1-libiberty ] || \
          mkdir stage1-libiberty; \
-       mv stage1-libiberty 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 
+       mv stage1-libiberty-linker-plugin libiberty-linker-plugin
 @endif libiberty-linker-plugin
 @if zlib
        @cd $(HOST_SUBDIR); [ -d stage1-zlib ] || \
          mkdir stage1-zlib; \
-       mv stage1-zlib zlib 
+       mv stage1-zlib zlib
 @endif zlib
 @if lto-plugin
        @cd $(HOST_SUBDIR); [ -d stage1-lto-plugin ] || \
          mkdir stage1-lto-plugin; \
-       mv stage1-lto-plugin lto-plugin 
+       mv stage1-lto-plugin lto-plugin
 @endif lto-plugin
        @[ -d stage1-$(TARGET_SUBDIR) ] || \
          mkdir stage1-$(TARGET_SUBDIR); \
-       mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR) 
+       mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR)
 
 stage1-end:: 
 @if bfd
-       @if test -d $(HOST_SUBDIR)/bfd ; then \
-         cd $(HOST_SUBDIR); mv bfd stage1-bfd  ; \
+       @if test -d $(HOST_SUBDIR)/bfd; then \
+         cd $(HOST_SUBDIR); mv bfd stage1-bfd; \
        fi
 @endif bfd
 @if opcodes
-       @if test -d $(HOST_SUBDIR)/opcodes ; then \
-         cd $(HOST_SUBDIR); mv opcodes stage1-opcodes  ; \
+       @if test -d $(HOST_SUBDIR)/opcodes; then \
+         cd $(HOST_SUBDIR); mv opcodes stage1-opcodes; \
        fi
 @endif opcodes
 @if binutils
-       @if test -d $(HOST_SUBDIR)/binutils ; then \
-         cd $(HOST_SUBDIR); mv binutils stage1-binutils  ; \
+       @if test -d $(HOST_SUBDIR)/binutils; then \
+         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  ; \
+       @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  ; \
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stage1-gas; \
        fi
 @endif gas
 @if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stage1-gcc  ; \
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stage1-gcc; \
        fi
 @endif gcc
 @if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stage1-gmp  ; \
+       @if test -d $(HOST_SUBDIR)/gmp; then \
+         cd $(HOST_SUBDIR); mv gmp stage1-gmp; \
        fi
 @endif gmp
 @if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stage1-mpfr  ; \
+       @if test -d $(HOST_SUBDIR)/mpfr; then \
+         cd $(HOST_SUBDIR); mv mpfr stage1-mpfr; \
        fi
 @endif mpfr
 @if mpc
-       @if test -d $(HOST_SUBDIR)/mpc ; then \
-         cd $(HOST_SUBDIR); mv mpc stage1-mpc  ; \
+       @if test -d $(HOST_SUBDIR)/mpc; then \
+         cd $(HOST_SUBDIR); mv mpc stage1-mpc; \
        fi
 @endif mpc
 @if isl
-       @if test -d $(HOST_SUBDIR)/isl ; then \
-         cd $(HOST_SUBDIR); mv isl stage1-isl  ; \
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stage1-isl; \
        fi
 @endif isl
-@if cloog
-       @if test -d $(HOST_SUBDIR)/cloog ; then \
-         cd $(HOST_SUBDIR); mv cloog stage1-cloog  ; \
-       fi
-@endif cloog
 @if libelf
-       @if test -d $(HOST_SUBDIR)/libelf ; then \
-         cd $(HOST_SUBDIR); mv libelf stage1-libelf  ; \
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stage1-libelf; \
        fi
 @endif libelf
 @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stage1-gold  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stage1-gold; \
        fi
 @endif gold
 @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stage1-intl  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stage1-intl; \
        fi
 @endif intl
 @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stage1-ld  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         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  ; \
+       @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  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stage1-libcpp; \
        fi
 @endif libcpp
 @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber; \
        fi
 @endif libdecnumber
 @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stage1-libiberty  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         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  ; \
+       @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  ; \
+       @if test -d $(HOST_SUBDIR)/zlib; then \
+         cd $(HOST_SUBDIR); mv zlib stage1-zlib; \
        fi
 @endif zlib
 @if lto-plugin
-       @if test -d $(HOST_SUBDIR)/lto-plugin ; then \
-         cd $(HOST_SUBDIR); mv lto-plugin stage1-lto-plugin  ; \
+       @if test -d $(HOST_SUBDIR)/lto-plugin; then \
+         cd $(HOST_SUBDIR); mv lto-plugin stage1-lto-plugin; \
        fi
 @endif lto-plugin
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR)  ; \
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); \
        fi
        rm -f stage_current
 
@@ -46084,8 +47663,8 @@ stage1-end::
 stage1-bubble:: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stage1-lean  ; then \
-         echo Skipping rebuild of stage1 ; \
+       if test -f stage1-lean ; then \
+         echo Skipping rebuild of stage1; \
        else \
          $(MAKE) stage1-start; \
          $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
@@ -46117,282 +47696,270 @@ distclean-stage1::
 
 stage2-start::
        @: $(MAKE); $(stage); \
-       echo stage2 > stage_current ; \
+       echo stage2 > stage_current; \
        echo stage2 > stage_last; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
 @if bfd
        @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
          mkdir stage2-bfd; \
-       mv stage2-bfd bfd  ; \
+       mv stage2-bfd bfd; \
        mv stage1-bfd prev-bfd || test -f stage1-lean 
 @endif bfd
 @if opcodes
        @cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
          mkdir stage2-opcodes; \
-       mv stage2-opcodes opcodes  ; \
+       mv stage2-opcodes opcodes; \
        mv stage1-opcodes prev-opcodes || test -f stage1-lean 
 @endif opcodes
 @if binutils
        @cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
          mkdir stage2-binutils; \
-       mv stage2-binutils binutils  ; \
+       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 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; \
-       mv stage2-gas gas  ; \
+       mv stage2-gas gas; \
        mv stage1-gas prev-gas || test -f stage1-lean 
 @endif gas
 @if gcc
        @cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
          mkdir stage2-gcc; \
-       mv stage2-gcc gcc  ; \
+       mv stage2-gcc gcc; \
        mv stage1-gcc prev-gcc || test -f stage1-lean 
 @endif gcc
 @if gmp
        @cd $(HOST_SUBDIR); [ -d stage2-gmp ] || \
          mkdir stage2-gmp; \
-       mv stage2-gmp gmp  ; \
+       mv stage2-gmp gmp; \
        mv stage1-gmp prev-gmp || test -f stage1-lean 
 @endif gmp
 @if mpfr
        @cd $(HOST_SUBDIR); [ -d stage2-mpfr ] || \
          mkdir stage2-mpfr; \
-       mv stage2-mpfr mpfr  ; \
+       mv stage2-mpfr mpfr; \
        mv stage1-mpfr prev-mpfr || test -f stage1-lean 
 @endif mpfr
 @if mpc
        @cd $(HOST_SUBDIR); [ -d stage2-mpc ] || \
          mkdir stage2-mpc; \
-       mv stage2-mpc mpc  ; \
+       mv stage2-mpc mpc; \
        mv stage1-mpc prev-mpc || test -f stage1-lean 
 @endif mpc
 @if isl
        @cd $(HOST_SUBDIR); [ -d stage2-isl ] || \
          mkdir stage2-isl; \
-       mv stage2-isl isl  ; \
+       mv stage2-isl isl; \
        mv stage1-isl prev-isl || test -f stage1-lean 
 @endif isl
-@if cloog
-       @cd $(HOST_SUBDIR); [ -d stage2-cloog ] || \
-         mkdir stage2-cloog; \
-       mv stage2-cloog cloog  ; \
-       mv stage1-cloog prev-cloog || test -f stage1-lean 
-@endif cloog
 @if libelf
        @cd $(HOST_SUBDIR); [ -d stage2-libelf ] || \
          mkdir stage2-libelf; \
-       mv stage2-libelf libelf  ; \
+       mv stage2-libelf libelf; \
        mv stage1-libelf prev-libelf || test -f stage1-lean 
 @endif libelf
 @if gold
        @cd $(HOST_SUBDIR); [ -d stage2-gold ] || \
          mkdir stage2-gold; \
-       mv stage2-gold gold  ; \
+       mv stage2-gold gold; \
        mv stage1-gold prev-gold || test -f stage1-lean 
 @endif gold
 @if intl
        @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
          mkdir stage2-intl; \
-       mv stage2-intl intl  ; \
+       mv stage2-intl intl; \
        mv stage1-intl prev-intl || test -f stage1-lean 
 @endif intl
 @if ld
        @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
          mkdir stage2-ld; \
-       mv stage2-ld ld  ; \
+       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 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; \
-       mv stage2-libcpp libcpp  ; \
+       mv stage2-libcpp libcpp; \
        mv stage1-libcpp prev-libcpp || test -f stage1-lean 
 @endif libcpp
 @if libdecnumber
        @cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \
          mkdir stage2-libdecnumber; \
-       mv stage2-libdecnumber libdecnumber  ; \
+       mv stage2-libdecnumber libdecnumber; \
        mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
 @endif libdecnumber
 @if libiberty
        @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
          mkdir stage2-libiberty; \
-       mv stage2-libiberty libiberty  ; \
+       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 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; \
-       mv stage2-zlib zlib  ; \
+       mv stage2-zlib zlib; \
        mv stage1-zlib prev-zlib || test -f stage1-lean 
 @endif zlib
 @if lto-plugin
        @cd $(HOST_SUBDIR); [ -d stage2-lto-plugin ] || \
          mkdir stage2-lto-plugin; \
-       mv stage2-lto-plugin lto-plugin  ; \
+       mv stage2-lto-plugin lto-plugin; \
        mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
 @endif lto-plugin
        @[ -d stage2-$(TARGET_SUBDIR) ] || \
          mkdir stage2-$(TARGET_SUBDIR); \
-       mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
+       mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
        mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
 
 stage2-end:: 
 @if bfd
-       @if test -d $(HOST_SUBDIR)/bfd ; then \
-         cd $(HOST_SUBDIR); mv bfd stage2-bfd ; \
-         mv prev-bfd stage1-bfd ; :  ; \
+       @if test -d $(HOST_SUBDIR)/bfd; then \
+         cd $(HOST_SUBDIR); mv bfd stage2-bfd; \
+         mv prev-bfd stage1-bfd; : ; \
        fi
 @endif bfd
 @if opcodes
-       @if test -d $(HOST_SUBDIR)/opcodes ; then \
-         cd $(HOST_SUBDIR); mv opcodes stage2-opcodes ; \
-         mv prev-opcodes stage1-opcodes ; :  ; \
+       @if test -d $(HOST_SUBDIR)/opcodes; then \
+         cd $(HOST_SUBDIR); mv opcodes stage2-opcodes; \
+         mv prev-opcodes stage1-opcodes; : ; \
        fi
 @endif opcodes
 @if binutils
-       @if test -d $(HOST_SUBDIR)/binutils ; then \
-         cd $(HOST_SUBDIR); mv binutils stage2-binutils ; \
-         mv prev-binutils stage1-binutils ; :  ; \
+       @if test -d $(HOST_SUBDIR)/binutils; then \
+         cd $(HOST_SUBDIR); mv binutils stage2-binutils; \
+         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 ; :  ; \
+       @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 ; \
-         mv prev-gas stage1-gas ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stage2-gas; \
+         mv prev-gas stage1-gas; : ; \
        fi
 @endif gas
 @if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stage2-gcc ; \
-         mv prev-gcc stage1-gcc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stage2-gcc; \
+         mv prev-gcc stage1-gcc; : ; \
        fi
 @endif gcc
 @if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stage2-gmp ; \
-         mv prev-gmp stage1-gmp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gmp; then \
+         cd $(HOST_SUBDIR); mv gmp stage2-gmp; \
+         mv prev-gmp stage1-gmp; : ; \
        fi
 @endif gmp
 @if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stage2-mpfr ; \
-         mv prev-mpfr stage1-mpfr ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpfr; then \
+         cd $(HOST_SUBDIR); mv mpfr stage2-mpfr; \
+         mv prev-mpfr stage1-mpfr; : ; \
        fi
 @endif mpfr
 @if mpc
-       @if test -d $(HOST_SUBDIR)/mpc ; then \
-         cd $(HOST_SUBDIR); mv mpc stage2-mpc ; \
-         mv prev-mpc stage1-mpc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpc; then \
+         cd $(HOST_SUBDIR); mv mpc stage2-mpc; \
+         mv prev-mpc stage1-mpc; : ; \
        fi
 @endif mpc
 @if isl
-       @if test -d $(HOST_SUBDIR)/isl ; then \
-         cd $(HOST_SUBDIR); mv isl stage2-isl ; \
-         mv prev-isl stage1-isl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stage2-isl; \
+         mv prev-isl stage1-isl; : ; \
        fi
 @endif isl
-@if cloog
-       @if test -d $(HOST_SUBDIR)/cloog ; then \
-         cd $(HOST_SUBDIR); mv cloog stage2-cloog ; \
-         mv prev-cloog stage1-cloog ; :  ; \
-       fi
-@endif cloog
 @if libelf
-       @if test -d $(HOST_SUBDIR)/libelf ; then \
-         cd $(HOST_SUBDIR); mv libelf stage2-libelf ; \
-         mv prev-libelf stage1-libelf ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stage2-libelf; \
+         mv prev-libelf stage1-libelf; : ; \
        fi
 @endif libelf
 @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stage2-gold ; \
-         mv prev-gold stage1-gold ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stage2-gold; \
+         mv prev-gold stage1-gold; : ; \
        fi
 @endif gold
 @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stage2-intl ; \
-         mv prev-intl stage1-intl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stage2-intl; \
+         mv prev-intl stage1-intl; : ; \
        fi
 @endif intl
 @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stage2-ld ; \
-         mv prev-ld stage1-ld ; :  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stage2-ld; \
+         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 ; :  ; \
+       @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 ; \
-         mv prev-libcpp stage1-libcpp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stage2-libcpp; \
+         mv prev-libcpp stage1-libcpp; : ; \
        fi
 @endif libcpp
 @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber ; \
-         mv prev-libdecnumber stage1-libdecnumber ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber; \
+         mv prev-libdecnumber stage1-libdecnumber; : ; \
        fi
 @endif libdecnumber
 @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stage2-libiberty ; \
-         mv prev-libiberty stage1-libiberty ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stage2-libiberty; \
+         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 ; :  ; \
+       @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 ; \
-         mv prev-zlib stage1-zlib ; :  ; \
+       @if test -d $(HOST_SUBDIR)/zlib; then \
+         cd $(HOST_SUBDIR); mv zlib stage2-zlib; \
+         mv prev-zlib stage1-zlib; : ; \
        fi
 @endif zlib
 @if lto-plugin
-       @if test -d $(HOST_SUBDIR)/lto-plugin ; then \
-         cd $(HOST_SUBDIR); mv lto-plugin stage2-lto-plugin ; \
-         mv prev-lto-plugin stage1-lto-plugin ; :  ; \
+       @if test -d $(HOST_SUBDIR)/lto-plugin; then \
+         cd $(HOST_SUBDIR); mv lto-plugin stage2-lto-plugin; \
+         mv prev-lto-plugin stage1-lto-plugin; : ; \
        fi
 @endif lto-plugin
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \
        fi
        rm -f stage_current
 
@@ -46403,8 +47970,8 @@ stage2-end::
 stage2-bubble:: stage1-bubble
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stage2-lean || test -f stage1-lean  ; then \
-         echo Skipping rebuild of stage2 ; \
+       if test -f stage2-lean || test -f stage1-lean ; then \
+         echo Skipping rebuild of stage2; \
        else \
          $(MAKE) stage2-start; \
          $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \
@@ -46459,282 +48026,270 @@ distclean-stage2::
 
 stage3-start::
        @: $(MAKE); $(stage); \
-       echo stage3 > stage_current ; \
+       echo stage3 > stage_current; \
        echo stage3 > stage_last; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
 @if bfd
        @cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \
          mkdir stage3-bfd; \
-       mv stage3-bfd bfd  ; \
+       mv stage3-bfd bfd; \
        mv stage2-bfd prev-bfd || test -f stage2-lean 
 @endif bfd
 @if opcodes
        @cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \
          mkdir stage3-opcodes; \
-       mv stage3-opcodes opcodes  ; \
+       mv stage3-opcodes opcodes; \
        mv stage2-opcodes prev-opcodes || test -f stage2-lean 
 @endif opcodes
 @if binutils
        @cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \
          mkdir stage3-binutils; \
-       mv stage3-binutils binutils  ; \
+       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 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; \
-       mv stage3-gas gas  ; \
+       mv stage3-gas gas; \
        mv stage2-gas prev-gas || test -f stage2-lean 
 @endif gas
 @if gcc
        @cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \
          mkdir stage3-gcc; \
-       mv stage3-gcc gcc  ; \
+       mv stage3-gcc gcc; \
        mv stage2-gcc prev-gcc || test -f stage2-lean 
 @endif gcc
 @if gmp
        @cd $(HOST_SUBDIR); [ -d stage3-gmp ] || \
          mkdir stage3-gmp; \
-       mv stage3-gmp gmp  ; \
+       mv stage3-gmp gmp; \
        mv stage2-gmp prev-gmp || test -f stage2-lean 
 @endif gmp
 @if mpfr
        @cd $(HOST_SUBDIR); [ -d stage3-mpfr ] || \
          mkdir stage3-mpfr; \
-       mv stage3-mpfr mpfr  ; \
+       mv stage3-mpfr mpfr; \
        mv stage2-mpfr prev-mpfr || test -f stage2-lean 
 @endif mpfr
 @if mpc
        @cd $(HOST_SUBDIR); [ -d stage3-mpc ] || \
          mkdir stage3-mpc; \
-       mv stage3-mpc mpc  ; \
+       mv stage3-mpc mpc; \
        mv stage2-mpc prev-mpc || test -f stage2-lean 
 @endif mpc
 @if isl
        @cd $(HOST_SUBDIR); [ -d stage3-isl ] || \
          mkdir stage3-isl; \
-       mv stage3-isl isl  ; \
+       mv stage3-isl isl; \
        mv stage2-isl prev-isl || test -f stage2-lean 
 @endif isl
-@if cloog
-       @cd $(HOST_SUBDIR); [ -d stage3-cloog ] || \
-         mkdir stage3-cloog; \
-       mv stage3-cloog cloog  ; \
-       mv stage2-cloog prev-cloog || test -f stage2-lean 
-@endif cloog
 @if libelf
        @cd $(HOST_SUBDIR); [ -d stage3-libelf ] || \
          mkdir stage3-libelf; \
-       mv stage3-libelf libelf  ; \
+       mv stage3-libelf libelf; \
        mv stage2-libelf prev-libelf || test -f stage2-lean 
 @endif libelf
 @if gold
        @cd $(HOST_SUBDIR); [ -d stage3-gold ] || \
          mkdir stage3-gold; \
-       mv stage3-gold gold  ; \
+       mv stage3-gold gold; \
        mv stage2-gold prev-gold || test -f stage2-lean 
 @endif gold
 @if intl
        @cd $(HOST_SUBDIR); [ -d stage3-intl ] || \
          mkdir stage3-intl; \
-       mv stage3-intl intl  ; \
+       mv stage3-intl intl; \
        mv stage2-intl prev-intl || test -f stage2-lean 
 @endif intl
 @if ld
        @cd $(HOST_SUBDIR); [ -d stage3-ld ] || \
          mkdir stage3-ld; \
-       mv stage3-ld ld  ; \
+       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 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; \
-       mv stage3-libcpp libcpp  ; \
+       mv stage3-libcpp libcpp; \
        mv stage2-libcpp prev-libcpp || test -f stage2-lean 
 @endif libcpp
 @if libdecnumber
        @cd $(HOST_SUBDIR); [ -d stage3-libdecnumber ] || \
          mkdir stage3-libdecnumber; \
-       mv stage3-libdecnumber libdecnumber  ; \
+       mv stage3-libdecnumber libdecnumber; \
        mv stage2-libdecnumber prev-libdecnumber || test -f stage2-lean 
 @endif libdecnumber
 @if libiberty
        @cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \
          mkdir stage3-libiberty; \
-       mv stage3-libiberty libiberty  ; \
+       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 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; \
-       mv stage3-zlib zlib  ; \
+       mv stage3-zlib zlib; \
        mv stage2-zlib prev-zlib || test -f stage2-lean 
 @endif zlib
 @if lto-plugin
        @cd $(HOST_SUBDIR); [ -d stage3-lto-plugin ] || \
          mkdir stage3-lto-plugin; \
-       mv stage3-lto-plugin lto-plugin  ; \
+       mv stage3-lto-plugin lto-plugin; \
        mv stage2-lto-plugin prev-lto-plugin || test -f stage2-lean 
 @endif lto-plugin
        @[ -d stage3-$(TARGET_SUBDIR) ] || \
          mkdir stage3-$(TARGET_SUBDIR); \
-       mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
+       mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
        mv stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage2-lean 
 
 stage3-end:: 
 @if bfd
-       @if test -d $(HOST_SUBDIR)/bfd ; then \
-         cd $(HOST_SUBDIR); mv bfd stage3-bfd ; \
-         mv prev-bfd stage2-bfd ; :  ; \
+       @if test -d $(HOST_SUBDIR)/bfd; then \
+         cd $(HOST_SUBDIR); mv bfd stage3-bfd; \
+         mv prev-bfd stage2-bfd; : ; \
        fi
 @endif bfd
 @if opcodes
-       @if test -d $(HOST_SUBDIR)/opcodes ; then \
-         cd $(HOST_SUBDIR); mv opcodes stage3-opcodes ; \
-         mv prev-opcodes stage2-opcodes ; :  ; \
+       @if test -d $(HOST_SUBDIR)/opcodes; then \
+         cd $(HOST_SUBDIR); mv opcodes stage3-opcodes; \
+         mv prev-opcodes stage2-opcodes; : ; \
        fi
 @endif opcodes
 @if binutils
-       @if test -d $(HOST_SUBDIR)/binutils ; then \
-         cd $(HOST_SUBDIR); mv binutils stage3-binutils ; \
-         mv prev-binutils stage2-binutils ; :  ; \
+       @if test -d $(HOST_SUBDIR)/binutils; then \
+         cd $(HOST_SUBDIR); mv binutils stage3-binutils; \
+         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 ; :  ; \
+       @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 ; \
-         mv prev-gas stage2-gas ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stage3-gas; \
+         mv prev-gas stage2-gas; : ; \
        fi
 @endif gas
 @if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stage3-gcc ; \
-         mv prev-gcc stage2-gcc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stage3-gcc; \
+         mv prev-gcc stage2-gcc; : ; \
        fi
 @endif gcc
 @if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stage3-gmp ; \
-         mv prev-gmp stage2-gmp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gmp; then \
+         cd $(HOST_SUBDIR); mv gmp stage3-gmp; \
+         mv prev-gmp stage2-gmp; : ; \
        fi
 @endif gmp
 @if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stage3-mpfr ; \
-         mv prev-mpfr stage2-mpfr ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpfr; then \
+         cd $(HOST_SUBDIR); mv mpfr stage3-mpfr; \
+         mv prev-mpfr stage2-mpfr; : ; \
        fi
 @endif mpfr
 @if mpc
-       @if test -d $(HOST_SUBDIR)/mpc ; then \
-         cd $(HOST_SUBDIR); mv mpc stage3-mpc ; \
-         mv prev-mpc stage2-mpc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpc; then \
+         cd $(HOST_SUBDIR); mv mpc stage3-mpc; \
+         mv prev-mpc stage2-mpc; : ; \
        fi
 @endif mpc
 @if isl
-       @if test -d $(HOST_SUBDIR)/isl ; then \
-         cd $(HOST_SUBDIR); mv isl stage3-isl ; \
-         mv prev-isl stage2-isl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stage3-isl; \
+         mv prev-isl stage2-isl; : ; \
        fi
 @endif isl
-@if cloog
-       @if test -d $(HOST_SUBDIR)/cloog ; then \
-         cd $(HOST_SUBDIR); mv cloog stage3-cloog ; \
-         mv prev-cloog stage2-cloog ; :  ; \
-       fi
-@endif cloog
 @if libelf
-       @if test -d $(HOST_SUBDIR)/libelf ; then \
-         cd $(HOST_SUBDIR); mv libelf stage3-libelf ; \
-         mv prev-libelf stage2-libelf ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stage3-libelf; \
+         mv prev-libelf stage2-libelf; : ; \
        fi
 @endif libelf
 @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stage3-gold ; \
-         mv prev-gold stage2-gold ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stage3-gold; \
+         mv prev-gold stage2-gold; : ; \
        fi
 @endif gold
 @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stage3-intl ; \
-         mv prev-intl stage2-intl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stage3-intl; \
+         mv prev-intl stage2-intl; : ; \
        fi
 @endif intl
 @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stage3-ld ; \
-         mv prev-ld stage2-ld ; :  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stage3-ld; \
+         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 ; :  ; \
+       @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 ; \
-         mv prev-libcpp stage2-libcpp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stage3-libcpp; \
+         mv prev-libcpp stage2-libcpp; : ; \
        fi
 @endif libcpp
 @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stage3-libdecnumber ; \
-         mv prev-libdecnumber stage2-libdecnumber ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stage3-libdecnumber; \
+         mv prev-libdecnumber stage2-libdecnumber; : ; \
        fi
 @endif libdecnumber
 @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stage3-libiberty ; \
-         mv prev-libiberty stage2-libiberty ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stage3-libiberty; \
+         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 ; :  ; \
+       @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 ; \
-         mv prev-zlib stage2-zlib ; :  ; \
+       @if test -d $(HOST_SUBDIR)/zlib; then \
+         cd $(HOST_SUBDIR); mv zlib stage3-zlib; \
+         mv prev-zlib stage2-zlib; : ; \
        fi
 @endif zlib
 @if lto-plugin
-       @if test -d $(HOST_SUBDIR)/lto-plugin ; then \
-         cd $(HOST_SUBDIR); mv lto-plugin stage3-lto-plugin ; \
-         mv prev-lto-plugin stage2-lto-plugin ; :  ; \
+       @if test -d $(HOST_SUBDIR)/lto-plugin; then \
+         cd $(HOST_SUBDIR); mv lto-plugin stage3-lto-plugin; \
+         mv prev-lto-plugin stage2-lto-plugin; : ; \
        fi
 @endif lto-plugin
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; :  ; \
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR); : ; \
        fi
        rm -f stage_current
 
@@ -46745,13 +48300,13 @@ stage3-end::
 stage3-bubble:: stage2-bubble
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stage3-lean || test -f stage2-lean  ; then \
-         echo Skipping rebuild of stage3 ; \
+       if test -f stage3-lean || test -f stage2-lean ; then \
+         echo Skipping rebuild of stage3; \
        else \
          $(MAKE) stage3-start; \
          if $(LEAN); then \
-           rm -rf stage1-* ; \
-           $(STAMP) stage1-lean ; \
+           rm -rf stage1-*; \
+           $(STAMP) stage1-lean; \
          fi; \
          $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \
        fi
@@ -46768,16 +48323,16 @@ compare:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        if test -f stage2-lean; then \
-         echo Cannot compare object files as stage 2 was deleted. ; \
-         exit 0 ; \
+         echo Cannot compare object files as stage 2 was deleted.; \
+         exit 0; \
        fi; \
        : $(MAKE); $(stage); \
-       rm -f .bad_compare ; \
-       echo Comparing stages 2 and 3 ; \
+       rm -f .bad_compare; \
+       echo Comparing stages 2 and 3; \
         sed=`echo stage3 | sed 's,^stage,,;s,.,.,g'`; \
        files=`find stage3-* -name "*$(objext)" -print | \
-                sed -n s,^stage$$sed-,,p` ; \
-       for file in $${files} ; do \
+                sed -n s,^stage$$sed-,,p`; \
+       for file in $${files}; do \
          f1=$$r/stage2-$$file; f2=$$r/stage3-$$file; \
          if test ! -f $$f1; then continue; fi; \
          $(do-compare) > /dev/null 2>&1; \
@@ -46787,16 +48342,16 @@ compare:
                echo warning: $$file differs ;; \
              *) \
                echo $$file differs >> .bad_compare ;; \
-           esac ; \
-         fi ; \
-       done ; \
+           esac; \
+         fi; \
+       done; \
        if [ -f .bad_compare ]; then \
          echo "Bootstrap comparison failure!"; \
          cat .bad_compare; \
          exit 1; \
        else \
          echo Comparison successful.; \
-       fi ; \
+       fi; \
        $(STAMP) compare
        if $(LEAN); then \
          rm -rf stage2-*; \
@@ -46857,668 +48412,644 @@ cleanstrap: do-distclean local-clean
 
 stage4-start::
        @: $(MAKE); $(stage); \
-       echo stage4 > stage_current ; \
+       echo stage4 > stage_current; \
        echo stage4 > stage_last; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
 @if bfd
        @cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \
          mkdir stage4-bfd; \
-       mv stage4-bfd bfd  ; \
+       mv stage4-bfd bfd; \
        mv stage3-bfd prev-bfd || test -f stage3-lean 
 @endif bfd
 @if opcodes
        @cd $(HOST_SUBDIR); [ -d stage4-opcodes ] || \
          mkdir stage4-opcodes; \
-       mv stage4-opcodes opcodes  ; \
+       mv stage4-opcodes opcodes; \
        mv stage3-opcodes prev-opcodes || test -f stage3-lean 
 @endif opcodes
 @if binutils
        @cd $(HOST_SUBDIR); [ -d stage4-binutils ] || \
          mkdir stage4-binutils; \
-       mv stage4-binutils binutils  ; \
+       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 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; \
-       mv stage4-gas gas  ; \
+       mv stage4-gas gas; \
        mv stage3-gas prev-gas || test -f stage3-lean 
 @endif gas
 @if gcc
        @cd $(HOST_SUBDIR); [ -d stage4-gcc ] || \
          mkdir stage4-gcc; \
-       mv stage4-gcc gcc  ; \
+       mv stage4-gcc gcc; \
        mv stage3-gcc prev-gcc || test -f stage3-lean 
 @endif gcc
 @if gmp
        @cd $(HOST_SUBDIR); [ -d stage4-gmp ] || \
          mkdir stage4-gmp; \
-       mv stage4-gmp gmp  ; \
+       mv stage4-gmp gmp; \
        mv stage3-gmp prev-gmp || test -f stage3-lean 
 @endif gmp
 @if mpfr
        @cd $(HOST_SUBDIR); [ -d stage4-mpfr ] || \
          mkdir stage4-mpfr; \
-       mv stage4-mpfr mpfr  ; \
+       mv stage4-mpfr mpfr; \
        mv stage3-mpfr prev-mpfr || test -f stage3-lean 
 @endif mpfr
 @if mpc
        @cd $(HOST_SUBDIR); [ -d stage4-mpc ] || \
          mkdir stage4-mpc; \
-       mv stage4-mpc mpc  ; \
+       mv stage4-mpc mpc; \
        mv stage3-mpc prev-mpc || test -f stage3-lean 
 @endif mpc
 @if isl
        @cd $(HOST_SUBDIR); [ -d stage4-isl ] || \
          mkdir stage4-isl; \
-       mv stage4-isl isl  ; \
+       mv stage4-isl isl; \
        mv stage3-isl prev-isl || test -f stage3-lean 
 @endif isl
-@if cloog
-       @cd $(HOST_SUBDIR); [ -d stage4-cloog ] || \
-         mkdir stage4-cloog; \
-       mv stage4-cloog cloog  ; \
-       mv stage3-cloog prev-cloog || test -f stage3-lean 
-@endif cloog
 @if libelf
        @cd $(HOST_SUBDIR); [ -d stage4-libelf ] || \
          mkdir stage4-libelf; \
-       mv stage4-libelf libelf  ; \
+       mv stage4-libelf libelf; \
        mv stage3-libelf prev-libelf || test -f stage3-lean 
 @endif libelf
 @if gold
        @cd $(HOST_SUBDIR); [ -d stage4-gold ] || \
          mkdir stage4-gold; \
-       mv stage4-gold gold  ; \
+       mv stage4-gold gold; \
        mv stage3-gold prev-gold || test -f stage3-lean 
 @endif gold
 @if intl
        @cd $(HOST_SUBDIR); [ -d stage4-intl ] || \
          mkdir stage4-intl; \
-       mv stage4-intl intl  ; \
+       mv stage4-intl intl; \
        mv stage3-intl prev-intl || test -f stage3-lean 
 @endif intl
 @if ld
        @cd $(HOST_SUBDIR); [ -d stage4-ld ] || \
          mkdir stage4-ld; \
-       mv stage4-ld ld  ; \
+       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 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; \
-       mv stage4-libcpp libcpp  ; \
+       mv stage4-libcpp libcpp; \
        mv stage3-libcpp prev-libcpp || test -f stage3-lean 
 @endif libcpp
 @if libdecnumber
        @cd $(HOST_SUBDIR); [ -d stage4-libdecnumber ] || \
          mkdir stage4-libdecnumber; \
-       mv stage4-libdecnumber libdecnumber  ; \
+       mv stage4-libdecnumber libdecnumber; \
        mv stage3-libdecnumber prev-libdecnumber || test -f stage3-lean 
 @endif libdecnumber
 @if libiberty
        @cd $(HOST_SUBDIR); [ -d stage4-libiberty ] || \
          mkdir stage4-libiberty; \
-       mv stage4-libiberty libiberty  ; \
+       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 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; \
-       mv stage4-zlib zlib  ; \
+       mv stage4-zlib zlib; \
        mv stage3-zlib prev-zlib || test -f stage3-lean 
 @endif zlib
 @if lto-plugin
        @cd $(HOST_SUBDIR); [ -d stage4-lto-plugin ] || \
          mkdir stage4-lto-plugin; \
-       mv stage4-lto-plugin lto-plugin  ; \
+       mv stage4-lto-plugin lto-plugin; \
        mv stage3-lto-plugin prev-lto-plugin || test -f stage3-lean 
 @endif lto-plugin
        @[ -d stage4-$(TARGET_SUBDIR) ] || \
          mkdir stage4-$(TARGET_SUBDIR); \
-       mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
+       mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
        mv stage3-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage3-lean 
 
 stage4-end:: 
 @if bfd
-       @if test -d $(HOST_SUBDIR)/bfd ; then \
-         cd $(HOST_SUBDIR); mv bfd stage4-bfd ; \
-         mv prev-bfd stage3-bfd ; :  ; \
-       fi
-@endif bfd
-@if opcodes
-       @if test -d $(HOST_SUBDIR)/opcodes ; then \
-         cd $(HOST_SUBDIR); mv opcodes stage4-opcodes ; \
-         mv prev-opcodes stage3-opcodes ; :  ; \
-       fi
-@endif opcodes
-@if binutils
-       @if test -d $(HOST_SUBDIR)/binutils ; then \
-         cd $(HOST_SUBDIR); mv binutils stage4-binutils ; \
-         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 ; \
-         mv prev-gas stage3-gas ; :  ; \
-       fi
-@endif gas
-@if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stage4-gcc ; \
-         mv prev-gcc stage3-gcc ; :  ; \
-       fi
-@endif gcc
-@if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stage4-gmp ; \
-         mv prev-gmp stage3-gmp ; :  ; \
-       fi
-@endif gmp
-@if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stage4-mpfr ; \
-         mv prev-mpfr stage3-mpfr ; :  ; \
-       fi
-@endif mpfr
-@if mpc
-       @if test -d $(HOST_SUBDIR)/mpc ; then \
-         cd $(HOST_SUBDIR); mv mpc stage4-mpc ; \
-         mv prev-mpc stage3-mpc ; :  ; \
-       fi
-@endif mpc
-@if isl
-       @if test -d $(HOST_SUBDIR)/isl ; then \
-         cd $(HOST_SUBDIR); mv isl stage4-isl ; \
-         mv prev-isl stage3-isl ; :  ; \
-       fi
-@endif isl
-@if cloog
-       @if test -d $(HOST_SUBDIR)/cloog ; then \
-         cd $(HOST_SUBDIR); mv cloog stage4-cloog ; \
-         mv prev-cloog stage3-cloog ; :  ; \
-       fi
-@endif cloog
-@if libelf
-       @if test -d $(HOST_SUBDIR)/libelf ; then \
-         cd $(HOST_SUBDIR); mv libelf stage4-libelf ; \
-         mv prev-libelf stage3-libelf ; :  ; \
-       fi
-@endif libelf
-@if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stage4-gold ; \
-         mv prev-gold stage3-gold ; :  ; \
-       fi
-@endif gold
-@if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stage4-intl ; \
-         mv prev-intl stage3-intl ; :  ; \
-       fi
-@endif intl
-@if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stage4-ld ; \
-         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 ; \
-         mv prev-libcpp stage3-libcpp ; :  ; \
-       fi
-@endif libcpp
-@if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stage4-libdecnumber ; \
-         mv prev-libdecnumber stage3-libdecnumber ; :  ; \
-       fi
-@endif libdecnumber
-@if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stage4-libiberty ; \
-         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 ; \
-         mv prev-zlib stage3-zlib ; :  ; \
-       fi
-@endif zlib
-@if lto-plugin
-       @if test -d $(HOST_SUBDIR)/lto-plugin ; then \
-         cd $(HOST_SUBDIR); mv lto-plugin stage4-lto-plugin ; \
-         mv prev-lto-plugin stage3-lto-plugin ; :  ; \
-       fi
-@endif lto-plugin
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; :  ; \
-       fi
-       rm -f stage_current
-
-# Bubble a bug fix through all the stages up to stage 4.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured either.
-.PHONY: stage4-bubble
-stage4-bubble:: stage3-bubble
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stage4-lean || test -f stage3-lean  ; then \
-         echo Skipping rebuild of stage4 ; \
-       else \
-         $(MAKE) stage4-start; \
-         if $(LEAN); then \
-           rm -rf stage2-* ; \
-           $(STAMP) stage2-lean ; \
-         fi; \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
-       fi
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3
-
-.PHONY: all-stage4 clean-stage4
-do-clean: clean-stage4
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-compare3:
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stage3-lean; then \
-         echo Cannot compare object files as stage 3 was deleted. ; \
-         exit 0 ; \
-       fi; \
-       : $(MAKE); $(stage); \
-       rm -f .bad_compare ; \
-       echo Comparing stages 3 and 4 ; \
-        sed=`echo stage4 | sed 's,^stage,,;s,.,.,g'`; \
-       files=`find stage4-* -name "*$(objext)" -print | \
-                sed -n s,^stage$$sed-,,p` ; \
-       for file in $${files} ; do \
-         f1=$$r/stage3-$$file; f2=$$r/stage4-$$file; \
-         if test ! -f $$f1; then continue; fi; \
-         $(do-compare3) > /dev/null 2>&1; \
-         if test $$? -eq 1; then \
-           case $$file in \
-             @compare_exclusions@) \
-               echo warning: $$file differs ;; \
-             *) \
-               echo $$file differs >> .bad_compare ;; \
-           esac ; \
-         fi ; \
-       done ; \
-       if [ -f .bad_compare ]; then \
-         echo "Bootstrap comparison failure!"; \
-         cat .bad_compare; \
-         exit 1; \
-       else \
-         echo Comparison successful.; \
-       fi ; \
-       $(STAMP) compare3
-       if $(LEAN); then \
-         rm -rf stage3-*; \
-         $(STAMP) stage3-lean; \
-       fi
-
-
-
-.PHONY: bootstrap4 bootstrap4-lean
-bootstrap4:
-       echo stage4 > stage_final
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage4-bubble
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-bootstrap4-lean:
-       echo stage4 > stage_final
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage4-bubble
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage3:: distclean-stage4 
-.PHONY: distclean-stage4
-distclean-stage4::
-       @: $(MAKE); $(stage)
-       @test "`cat stage_last`" != stage4 || rm -f stage_last
-       rm -rf stage4-* compare3 
-
-
-@endif gcc-bootstrap
-
-
-.PHONY: stageprofile-start stageprofile-end
-
-stageprofile-start::
-       @: $(MAKE); $(stage); \
-       echo stageprofile > stage_current ; \
-       echo stageprofile > stage_last; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-       @cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \
-         mkdir stageprofile-bfd; \
-       mv stageprofile-bfd bfd  ; \
-       mv stage1-bfd prev-bfd || test -f stage1-lean 
-@endif bfd
-@if opcodes
-       @cd $(HOST_SUBDIR); [ -d stageprofile-opcodes ] || \
-         mkdir stageprofile-opcodes; \
-       mv stageprofile-opcodes opcodes  ; \
-       mv stage1-opcodes prev-opcodes || test -f stage1-lean 
-@endif opcodes
-@if binutils
-       @cd $(HOST_SUBDIR); [ -d stageprofile-binutils ] || \
-         mkdir stageprofile-binutils; \
-       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; \
-       mv stageprofile-gas gas  ; \
-       mv stage1-gas prev-gas || test -f stage1-lean 
-@endif gas
-@if gcc
-       @cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \
-         mkdir stageprofile-gcc; \
-       mv stageprofile-gcc gcc  ; \
-       mv stage1-gcc prev-gcc || test -f stage1-lean 
-@endif gcc
-@if gmp
-       @cd $(HOST_SUBDIR); [ -d stageprofile-gmp ] || \
-         mkdir stageprofile-gmp; \
-       mv stageprofile-gmp gmp  ; \
-       mv stage1-gmp prev-gmp || test -f stage1-lean 
-@endif gmp
-@if mpfr
-       @cd $(HOST_SUBDIR); [ -d stageprofile-mpfr ] || \
-         mkdir stageprofile-mpfr; \
-       mv stageprofile-mpfr mpfr  ; \
-       mv stage1-mpfr prev-mpfr || test -f stage1-lean 
-@endif mpfr
-@if mpc
-       @cd $(HOST_SUBDIR); [ -d stageprofile-mpc ] || \
-         mkdir stageprofile-mpc; \
-       mv stageprofile-mpc mpc  ; \
-       mv stage1-mpc prev-mpc || test -f stage1-lean 
-@endif mpc
-@if isl
-       @cd $(HOST_SUBDIR); [ -d stageprofile-isl ] || \
-         mkdir stageprofile-isl; \
-       mv stageprofile-isl isl  ; \
-       mv stage1-isl prev-isl || test -f stage1-lean 
-@endif isl
-@if cloog
-       @cd $(HOST_SUBDIR); [ -d stageprofile-cloog ] || \
-         mkdir stageprofile-cloog; \
-       mv stageprofile-cloog cloog  ; \
-       mv stage1-cloog prev-cloog || test -f stage1-lean 
-@endif cloog
-@if libelf
-       @cd $(HOST_SUBDIR); [ -d stageprofile-libelf ] || \
-         mkdir stageprofile-libelf; \
-       mv stageprofile-libelf libelf  ; \
-       mv stage1-libelf prev-libelf || test -f stage1-lean 
-@endif libelf
-@if gold
-       @cd $(HOST_SUBDIR); [ -d stageprofile-gold ] || \
-         mkdir stageprofile-gold; \
-       mv stageprofile-gold gold  ; \
-       mv stage1-gold prev-gold || test -f stage1-lean 
-@endif gold
-@if intl
-       @cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \
-         mkdir stageprofile-intl; \
-       mv stageprofile-intl intl  ; \
-       mv stage1-intl prev-intl || test -f stage1-lean 
-@endif intl
-@if ld
-       @cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \
-         mkdir stageprofile-ld; \
-       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; \
-       mv stageprofile-libcpp libcpp  ; \
-       mv stage1-libcpp prev-libcpp || test -f stage1-lean 
-@endif libcpp
-@if libdecnumber
-       @cd $(HOST_SUBDIR); [ -d stageprofile-libdecnumber ] || \
-         mkdir stageprofile-libdecnumber; \
-       mv stageprofile-libdecnumber libdecnumber  ; \
-       mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
-@endif libdecnumber
-@if libiberty
-       @cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \
-         mkdir stageprofile-libiberty; \
-       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; \
-       mv stageprofile-zlib zlib  ; \
-       mv stage1-zlib prev-zlib || test -f stage1-lean 
-@endif zlib
-@if lto-plugin
-       @cd $(HOST_SUBDIR); [ -d stageprofile-lto-plugin ] || \
-         mkdir stageprofile-lto-plugin; \
-       mv stageprofile-lto-plugin lto-plugin  ; \
-       mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
-@endif lto-plugin
-       @[ -d stageprofile-$(TARGET_SUBDIR) ] || \
-         mkdir stageprofile-$(TARGET_SUBDIR); \
-       mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-       mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
-
-stageprofile-end:: 
-@if bfd
-       @if test -d $(HOST_SUBDIR)/bfd ; then \
-         cd $(HOST_SUBDIR); mv bfd stageprofile-bfd ; \
-         mv prev-bfd stage1-bfd ; :  ; \
+       @if test -d $(HOST_SUBDIR)/bfd; then \
+         cd $(HOST_SUBDIR); mv bfd stage4-bfd; \
+         mv prev-bfd stage3-bfd; : ; \
        fi
 @endif bfd
 @if opcodes
-       @if test -d $(HOST_SUBDIR)/opcodes ; then \
-         cd $(HOST_SUBDIR); mv opcodes stageprofile-opcodes ; \
-         mv prev-opcodes stage1-opcodes ; :  ; \
+       @if test -d $(HOST_SUBDIR)/opcodes; then \
+         cd $(HOST_SUBDIR); mv opcodes stage4-opcodes; \
+         mv prev-opcodes stage3-opcodes; : ; \
        fi
 @endif opcodes
 @if binutils
-       @if test -d $(HOST_SUBDIR)/binutils ; then \
-         cd $(HOST_SUBDIR); mv binutils stageprofile-binutils ; \
-         mv prev-binutils stage1-binutils ; :  ; \
+       @if test -d $(HOST_SUBDIR)/binutils; then \
+         cd $(HOST_SUBDIR); mv binutils stage4-binutils; \
+         mv prev-binutils stage3-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 ; :  ; \
+       @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 stageprofile-gas ; \
-         mv prev-gas stage1-gas ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stage4-gas; \
+         mv prev-gas stage3-gas; : ; \
        fi
 @endif gas
 @if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stageprofile-gcc ; \
-         mv prev-gcc stage1-gcc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stage4-gcc; \
+         mv prev-gcc stage3-gcc; : ; \
        fi
 @endif gcc
 @if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stageprofile-gmp ; \
-         mv prev-gmp stage1-gmp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gmp; then \
+         cd $(HOST_SUBDIR); mv gmp stage4-gmp; \
+         mv prev-gmp stage3-gmp; : ; \
        fi
 @endif gmp
 @if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stageprofile-mpfr ; \
-         mv prev-mpfr stage1-mpfr ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpfr; then \
+         cd $(HOST_SUBDIR); mv mpfr stage4-mpfr; \
+         mv prev-mpfr stage3-mpfr; : ; \
        fi
 @endif mpfr
 @if mpc
-       @if test -d $(HOST_SUBDIR)/mpc ; then \
-         cd $(HOST_SUBDIR); mv mpc stageprofile-mpc ; \
-         mv prev-mpc stage1-mpc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpc; then \
+         cd $(HOST_SUBDIR); mv mpc stage4-mpc; \
+         mv prev-mpc stage3-mpc; : ; \
        fi
 @endif mpc
 @if isl
-       @if test -d $(HOST_SUBDIR)/isl ; then \
-         cd $(HOST_SUBDIR); mv isl stageprofile-isl ; \
-         mv prev-isl stage1-isl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stage4-isl; \
+         mv prev-isl stage3-isl; : ; \
        fi
 @endif isl
-@if cloog
-       @if test -d $(HOST_SUBDIR)/cloog ; then \
-         cd $(HOST_SUBDIR); mv cloog stageprofile-cloog ; \
-         mv prev-cloog stage1-cloog ; :  ; \
+@if libelf
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stage4-libelf; \
+         mv prev-libelf stage3-libelf; : ; \
+       fi
+@endif libelf
+@if gold
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stage4-gold; \
+         mv prev-gold stage3-gold; : ; \
+       fi
+@endif gold
+@if intl
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stage4-intl; \
+         mv prev-intl stage3-intl; : ; \
+       fi
+@endif intl
+@if ld
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stage4-ld; \
+         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; \
+         mv prev-libcpp stage3-libcpp; : ; \
+       fi
+@endif libcpp
+@if libdecnumber
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stage4-libdecnumber; \
+         mv prev-libdecnumber stage3-libdecnumber; : ; \
+       fi
+@endif libdecnumber
+@if libiberty
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stage4-libiberty; \
+         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; \
+         mv prev-zlib stage3-zlib; : ; \
+       fi
+@endif zlib
+@if lto-plugin
+       @if test -d $(HOST_SUBDIR)/lto-plugin; then \
+         cd $(HOST_SUBDIR); mv lto-plugin stage4-lto-plugin; \
+         mv prev-lto-plugin stage3-lto-plugin; : ; \
+       fi
+@endif lto-plugin
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR); : ; \
+       fi
+       rm -f stage_current
+
+# Bubble a bug fix through all the stages up to stage 4.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured either.
+.PHONY: stage4-bubble
+stage4-bubble:: stage3-bubble
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       if test -f stage4-lean || test -f stage3-lean ; then \
+         echo Skipping rebuild of stage4; \
+       else \
+         $(MAKE) stage4-start; \
+         if $(LEAN); then \
+           rm -rf stage2-*; \
+           $(STAMP) stage2-lean; \
+         fi; \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
+       fi
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3
+
+.PHONY: all-stage4 clean-stage4
+do-clean: clean-stage4
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+compare3:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       if test -f stage3-lean; then \
+         echo Cannot compare object files as stage 3 was deleted.; \
+         exit 0; \
+       fi; \
+       : $(MAKE); $(stage); \
+       rm -f .bad_compare; \
+       echo Comparing stages 3 and 4; \
+        sed=`echo stage4 | sed 's,^stage,,;s,.,.,g'`; \
+       files=`find stage4-* -name "*$(objext)" -print | \
+                sed -n s,^stage$$sed-,,p`; \
+       for file in $${files}; do \
+         f1=$$r/stage3-$$file; f2=$$r/stage4-$$file; \
+         if test ! -f $$f1; then continue; fi; \
+         $(do-compare3) > /dev/null 2>&1; \
+         if test $$? -eq 1; then \
+           case $$file in \
+             @compare_exclusions@) \
+               echo warning: $$file differs ;; \
+             *) \
+               echo $$file differs >> .bad_compare ;; \
+           esac; \
+         fi; \
+       done; \
+       if [ -f .bad_compare ]; then \
+         echo "Bootstrap comparison failure!"; \
+         cat .bad_compare; \
+         exit 1; \
+       else \
+         echo Comparison successful.; \
+       fi; \
+       $(STAMP) compare3
+       if $(LEAN); then \
+         rm -rf stage3-*; \
+         $(STAMP) stage3-lean; \
+       fi
+
+
+
+.PHONY: bootstrap4 bootstrap4-lean
+bootstrap4:
+       echo stage4 > stage_final
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage4-bubble
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+bootstrap4-lean:
+       echo stage4 > stage_final
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage4-bubble
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage3:: distclean-stage4 
+.PHONY: distclean-stage4
+distclean-stage4::
+       @: $(MAKE); $(stage)
+       @test "`cat stage_last`" != stage4 || rm -f stage_last
+       rm -rf stage4-* compare3 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stageprofile-start stageprofile-end
+
+stageprofile-start::
+       @: $(MAKE); $(stage); \
+       echo stageprofile > stage_current; \
+       echo stageprofile > stage_last; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+@if bfd
+       @cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \
+         mkdir stageprofile-bfd; \
+       mv stageprofile-bfd bfd; \
+       mv stage1-bfd prev-bfd || test -f stage1-lean 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); [ -d stageprofile-opcodes ] || \
+         mkdir stageprofile-opcodes; \
+       mv stageprofile-opcodes opcodes; \
+       mv stage1-opcodes prev-opcodes || test -f stage1-lean 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); [ -d stageprofile-binutils ] || \
+         mkdir stageprofile-binutils; \
+       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; \
+       mv stageprofile-gas gas; \
+       mv stage1-gas prev-gas || test -f stage1-lean 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \
+         mkdir stageprofile-gcc; \
+       mv stageprofile-gcc gcc; \
+       mv stage1-gcc prev-gcc || test -f stage1-lean 
+@endif gcc
+@if gmp
+       @cd $(HOST_SUBDIR); [ -d stageprofile-gmp ] || \
+         mkdir stageprofile-gmp; \
+       mv stageprofile-gmp gmp; \
+       mv stage1-gmp prev-gmp || test -f stage1-lean 
+@endif gmp
+@if mpfr
+       @cd $(HOST_SUBDIR); [ -d stageprofile-mpfr ] || \
+         mkdir stageprofile-mpfr; \
+       mv stageprofile-mpfr mpfr; \
+       mv stage1-mpfr prev-mpfr || test -f stage1-lean 
+@endif mpfr
+@if mpc
+       @cd $(HOST_SUBDIR); [ -d stageprofile-mpc ] || \
+         mkdir stageprofile-mpc; \
+       mv stageprofile-mpc mpc; \
+       mv stage1-mpc prev-mpc || test -f stage1-lean 
+@endif mpc
+@if isl
+       @cd $(HOST_SUBDIR); [ -d stageprofile-isl ] || \
+         mkdir stageprofile-isl; \
+       mv stageprofile-isl isl; \
+       mv stage1-isl prev-isl || test -f stage1-lean 
+@endif isl
+@if libelf
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libelf ] || \
+         mkdir stageprofile-libelf; \
+       mv stageprofile-libelf libelf; \
+       mv stage1-libelf prev-libelf || test -f stage1-lean 
+@endif libelf
+@if gold
+       @cd $(HOST_SUBDIR); [ -d stageprofile-gold ] || \
+         mkdir stageprofile-gold; \
+       mv stageprofile-gold gold; \
+       mv stage1-gold prev-gold || test -f stage1-lean 
+@endif gold
+@if intl
+       @cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \
+         mkdir stageprofile-intl; \
+       mv stageprofile-intl intl; \
+       mv stage1-intl prev-intl || test -f stage1-lean 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \
+         mkdir stageprofile-ld; \
+       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; \
+       mv stageprofile-libcpp libcpp; \
+       mv stage1-libcpp prev-libcpp || test -f stage1-lean 
+@endif libcpp
+@if libdecnumber
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libdecnumber ] || \
+         mkdir stageprofile-libdecnumber; \
+       mv stageprofile-libdecnumber libdecnumber; \
+       mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
+@endif libdecnumber
+@if libiberty
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \
+         mkdir stageprofile-libiberty; \
+       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; \
+       mv stageprofile-zlib zlib; \
+       mv stage1-zlib prev-zlib || test -f stage1-lean 
+@endif zlib
+@if lto-plugin
+       @cd $(HOST_SUBDIR); [ -d stageprofile-lto-plugin ] || \
+         mkdir stageprofile-lto-plugin; \
+       mv stageprofile-lto-plugin lto-plugin; \
+       mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
+@endif lto-plugin
+       @[ -d stageprofile-$(TARGET_SUBDIR) ] || \
+         mkdir stageprofile-$(TARGET_SUBDIR); \
+       mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
+       mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
+
+stageprofile-end:: 
+@if bfd
+       @if test -d $(HOST_SUBDIR)/bfd; then \
+         cd $(HOST_SUBDIR); mv bfd stageprofile-bfd; \
+         mv prev-bfd stage1-bfd; : ; \
+       fi
+@endif bfd
+@if opcodes
+       @if test -d $(HOST_SUBDIR)/opcodes; then \
+         cd $(HOST_SUBDIR); mv opcodes stageprofile-opcodes; \
+         mv prev-opcodes stage1-opcodes; : ; \
+       fi
+@endif opcodes
+@if binutils
+       @if test -d $(HOST_SUBDIR)/binutils; then \
+         cd $(HOST_SUBDIR); mv binutils stageprofile-binutils; \
+         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; \
+         mv prev-gas stage1-gas; : ; \
+       fi
+@endif gas
+@if gcc
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stageprofile-gcc; \
+         mv prev-gcc stage1-gcc; : ; \
        fi
-@endif cloog
+@endif gcc
+@if gmp
+       @if test -d $(HOST_SUBDIR)/gmp; then \
+         cd $(HOST_SUBDIR); mv gmp stageprofile-gmp; \
+         mv prev-gmp stage1-gmp; : ; \
+       fi
+@endif gmp
+@if mpfr
+       @if test -d $(HOST_SUBDIR)/mpfr; then \
+         cd $(HOST_SUBDIR); mv mpfr stageprofile-mpfr; \
+         mv prev-mpfr stage1-mpfr; : ; \
+       fi
+@endif mpfr
+@if mpc
+       @if test -d $(HOST_SUBDIR)/mpc; then \
+         cd $(HOST_SUBDIR); mv mpc stageprofile-mpc; \
+         mv prev-mpc stage1-mpc; : ; \
+       fi
+@endif mpc
+@if isl
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stageprofile-isl; \
+         mv prev-isl stage1-isl; : ; \
+       fi
+@endif isl
 @if libelf
-       @if test -d $(HOST_SUBDIR)/libelf ; then \
-         cd $(HOST_SUBDIR); mv libelf stageprofile-libelf ; \
-         mv prev-libelf stage1-libelf ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stageprofile-libelf; \
+         mv prev-libelf stage1-libelf; : ; \
        fi
 @endif libelf
 @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stageprofile-gold ; \
-         mv prev-gold stage1-gold ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stageprofile-gold; \
+         mv prev-gold stage1-gold; : ; \
        fi
 @endif gold
 @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stageprofile-intl ; \
-         mv prev-intl stage1-intl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stageprofile-intl; \
+         mv prev-intl stage1-intl; : ; \
        fi
 @endif intl
 @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stageprofile-ld ; \
-         mv prev-ld stage1-ld ; :  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stageprofile-ld; \
+         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 ; :  ; \
+       @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 ; \
-         mv prev-libcpp stage1-libcpp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stageprofile-libcpp; \
+         mv prev-libcpp stage1-libcpp; : ; \
        fi
 @endif libcpp
 @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stageprofile-libdecnumber ; \
-         mv prev-libdecnumber stage1-libdecnumber ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stageprofile-libdecnumber; \
+         mv prev-libdecnumber stage1-libdecnumber; : ; \
        fi
 @endif libdecnumber
 @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stageprofile-libiberty ; \
-         mv prev-libiberty stage1-libiberty ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stageprofile-libiberty; \
+         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 ; :  ; \
+       @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 ; \
-         mv prev-zlib stage1-zlib ; :  ; \
+       @if test -d $(HOST_SUBDIR)/zlib; then \
+         cd $(HOST_SUBDIR); mv zlib stageprofile-zlib; \
+         mv prev-zlib stage1-zlib; : ; \
        fi
 @endif zlib
 @if lto-plugin
-       @if test -d $(HOST_SUBDIR)/lto-plugin ; then \
-         cd $(HOST_SUBDIR); mv lto-plugin stageprofile-lto-plugin ; \
-         mv prev-lto-plugin stage1-lto-plugin ; :  ; \
+       @if test -d $(HOST_SUBDIR)/lto-plugin; then \
+         cd $(HOST_SUBDIR); mv lto-plugin stageprofile-lto-plugin; \
+         mv prev-lto-plugin stage1-lto-plugin; : ; \
        fi
 @endif lto-plugin
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \
        fi
        rm -f stage_current
 
@@ -47529,8 +49060,8 @@ stageprofile-end::
 stageprofile-bubble:: stage1-bubble
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stageprofile-lean || test -f stage1-lean  ; then \
-         echo Skipping rebuild of stageprofile ; \
+       if test -f stageprofile-lean || test -f stage1-lean ; then \
+         echo Skipping rebuild of stageprofile; \
        else \
          $(MAKE) stageprofile-start; \
          $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile; \
@@ -47562,282 +49093,270 @@ distclean-stageprofile::
 
 stagefeedback-start::
        @: $(MAKE); $(stage); \
-       echo stagefeedback > stage_current ; \
+       echo stagefeedback > stage_current; \
        echo stagefeedback > stage_last; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
 @if bfd
        @cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \
          mkdir stagefeedback-bfd; \
-       mv stagefeedback-bfd bfd  ; \
+       mv stagefeedback-bfd bfd; \
        mv stageprofile-bfd prev-bfd || test -f stageprofile-lean 
 @endif bfd
 @if opcodes
        @cd $(HOST_SUBDIR); [ -d stagefeedback-opcodes ] || \
          mkdir stagefeedback-opcodes; \
-       mv stagefeedback-opcodes opcodes  ; \
+       mv stagefeedback-opcodes opcodes; \
        mv stageprofile-opcodes prev-opcodes || test -f stageprofile-lean 
 @endif opcodes
 @if binutils
        @cd $(HOST_SUBDIR); [ -d stagefeedback-binutils ] || \
          mkdir stagefeedback-binutils; \
-       mv stagefeedback-binutils binutils  ; \
+       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 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; \
-       mv stagefeedback-gas gas  ; \
+       mv stagefeedback-gas gas; \
        mv stageprofile-gas prev-gas || test -f stageprofile-lean 
 @endif gas
 @if gcc
        @cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \
          mkdir stagefeedback-gcc; \
-       mv stagefeedback-gcc gcc  ; \
+       mv stagefeedback-gcc gcc; \
        mv stageprofile-gcc prev-gcc || test -f stageprofile-lean 
 @endif gcc
 @if gmp
        @cd $(HOST_SUBDIR); [ -d stagefeedback-gmp ] || \
          mkdir stagefeedback-gmp; \
-       mv stagefeedback-gmp gmp  ; \
+       mv stagefeedback-gmp gmp; \
        mv stageprofile-gmp prev-gmp || test -f stageprofile-lean 
 @endif gmp
 @if mpfr
        @cd $(HOST_SUBDIR); [ -d stagefeedback-mpfr ] || \
          mkdir stagefeedback-mpfr; \
-       mv stagefeedback-mpfr mpfr  ; \
+       mv stagefeedback-mpfr mpfr; \
        mv stageprofile-mpfr prev-mpfr || test -f stageprofile-lean 
 @endif mpfr
 @if mpc
        @cd $(HOST_SUBDIR); [ -d stagefeedback-mpc ] || \
          mkdir stagefeedback-mpc; \
-       mv stagefeedback-mpc mpc  ; \
+       mv stagefeedback-mpc mpc; \
        mv stageprofile-mpc prev-mpc || test -f stageprofile-lean 
 @endif mpc
 @if isl
        @cd $(HOST_SUBDIR); [ -d stagefeedback-isl ] || \
          mkdir stagefeedback-isl; \
-       mv stagefeedback-isl isl  ; \
+       mv stagefeedback-isl isl; \
        mv stageprofile-isl prev-isl || test -f stageprofile-lean 
 @endif isl
-@if cloog
-       @cd $(HOST_SUBDIR); [ -d stagefeedback-cloog ] || \
-         mkdir stagefeedback-cloog; \
-       mv stagefeedback-cloog cloog  ; \
-       mv stageprofile-cloog prev-cloog || test -f stageprofile-lean 
-@endif cloog
 @if libelf
        @cd $(HOST_SUBDIR); [ -d stagefeedback-libelf ] || \
          mkdir stagefeedback-libelf; \
-       mv stagefeedback-libelf libelf  ; \
+       mv stagefeedback-libelf libelf; \
        mv stageprofile-libelf prev-libelf || test -f stageprofile-lean 
 @endif libelf
 @if gold
        @cd $(HOST_SUBDIR); [ -d stagefeedback-gold ] || \
          mkdir stagefeedback-gold; \
-       mv stagefeedback-gold gold  ; \
+       mv stagefeedback-gold gold; \
        mv stageprofile-gold prev-gold || test -f stageprofile-lean 
 @endif gold
 @if intl
        @cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \
          mkdir stagefeedback-intl; \
-       mv stagefeedback-intl intl  ; \
+       mv stagefeedback-intl intl; \
        mv stageprofile-intl prev-intl || test -f stageprofile-lean 
 @endif intl
 @if ld
        @cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \
          mkdir stagefeedback-ld; \
-       mv stagefeedback-ld ld  ; \
+       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 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; \
-       mv stagefeedback-libcpp libcpp  ; \
+       mv stagefeedback-libcpp libcpp; \
        mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean 
 @endif libcpp
 @if libdecnumber
        @cd $(HOST_SUBDIR); [ -d stagefeedback-libdecnumber ] || \
          mkdir stagefeedback-libdecnumber; \
-       mv stagefeedback-libdecnumber libdecnumber  ; \
+       mv stagefeedback-libdecnumber libdecnumber; \
        mv stageprofile-libdecnumber prev-libdecnumber || test -f stageprofile-lean 
 @endif libdecnumber
 @if libiberty
        @cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \
          mkdir stagefeedback-libiberty; \
-       mv stagefeedback-libiberty libiberty  ; \
+       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 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; \
-       mv stagefeedback-zlib zlib  ; \
+       mv stagefeedback-zlib zlib; \
        mv stageprofile-zlib prev-zlib || test -f stageprofile-lean 
 @endif zlib
 @if lto-plugin
        @cd $(HOST_SUBDIR); [ -d stagefeedback-lto-plugin ] || \
          mkdir stagefeedback-lto-plugin; \
-       mv stagefeedback-lto-plugin lto-plugin  ; \
+       mv stagefeedback-lto-plugin lto-plugin; \
        mv stageprofile-lto-plugin prev-lto-plugin || test -f stageprofile-lean 
 @endif lto-plugin
        @[ -d stagefeedback-$(TARGET_SUBDIR) ] || \
          mkdir stagefeedback-$(TARGET_SUBDIR); \
-       mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
+       mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
        mv stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageprofile-lean 
 
 stagefeedback-end:: 
 @if bfd
-       @if test -d $(HOST_SUBDIR)/bfd ; then \
-         cd $(HOST_SUBDIR); mv bfd stagefeedback-bfd ; \
-         mv prev-bfd stageprofile-bfd ; :  ; \
+       @if test -d $(HOST_SUBDIR)/bfd; then \
+         cd $(HOST_SUBDIR); mv bfd stagefeedback-bfd; \
+         mv prev-bfd stageprofile-bfd; : ; \
        fi
 @endif bfd
 @if opcodes
-       @if test -d $(HOST_SUBDIR)/opcodes ; then \
-         cd $(HOST_SUBDIR); mv opcodes stagefeedback-opcodes ; \
-         mv prev-opcodes stageprofile-opcodes ; :  ; \
+       @if test -d $(HOST_SUBDIR)/opcodes; then \
+         cd $(HOST_SUBDIR); mv opcodes stagefeedback-opcodes; \
+         mv prev-opcodes stageprofile-opcodes; : ; \
        fi
 @endif opcodes
 @if binutils
-       @if test -d $(HOST_SUBDIR)/binutils ; then \
-         cd $(HOST_SUBDIR); mv binutils stagefeedback-binutils ; \
-         mv prev-binutils stageprofile-binutils ; :  ; \
+       @if test -d $(HOST_SUBDIR)/binutils; then \
+         cd $(HOST_SUBDIR); mv binutils stagefeedback-binutils; \
+         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 ; :  ; \
+       @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 ; \
-         mv prev-gas stageprofile-gas ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stagefeedback-gas; \
+         mv prev-gas stageprofile-gas; : ; \
        fi
 @endif gas
 @if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc ; \
-         mv prev-gcc stageprofile-gcc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc; \
+         mv prev-gcc stageprofile-gcc; : ; \
        fi
 @endif gcc
 @if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stagefeedback-gmp ; \
-         mv prev-gmp stageprofile-gmp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gmp; then \
+         cd $(HOST_SUBDIR); mv gmp stagefeedback-gmp; \
+         mv prev-gmp stageprofile-gmp; : ; \
        fi
 @endif gmp
 @if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stagefeedback-mpfr ; \
-         mv prev-mpfr stageprofile-mpfr ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpfr; then \
+         cd $(HOST_SUBDIR); mv mpfr stagefeedback-mpfr; \
+         mv prev-mpfr stageprofile-mpfr; : ; \
        fi
 @endif mpfr
 @if mpc
-       @if test -d $(HOST_SUBDIR)/mpc ; then \
-         cd $(HOST_SUBDIR); mv mpc stagefeedback-mpc ; \
-         mv prev-mpc stageprofile-mpc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpc; then \
+         cd $(HOST_SUBDIR); mv mpc stagefeedback-mpc; \
+         mv prev-mpc stageprofile-mpc; : ; \
        fi
 @endif mpc
 @if isl
-       @if test -d $(HOST_SUBDIR)/isl ; then \
-         cd $(HOST_SUBDIR); mv isl stagefeedback-isl ; \
-         mv prev-isl stageprofile-isl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stagefeedback-isl; \
+         mv prev-isl stageprofile-isl; : ; \
        fi
 @endif isl
-@if cloog
-       @if test -d $(HOST_SUBDIR)/cloog ; then \
-         cd $(HOST_SUBDIR); mv cloog stagefeedback-cloog ; \
-         mv prev-cloog stageprofile-cloog ; :  ; \
-       fi
-@endif cloog
 @if libelf
-       @if test -d $(HOST_SUBDIR)/libelf ; then \
-         cd $(HOST_SUBDIR); mv libelf stagefeedback-libelf ; \
-         mv prev-libelf stageprofile-libelf ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stagefeedback-libelf; \
+         mv prev-libelf stageprofile-libelf; : ; \
        fi
 @endif libelf
 @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stagefeedback-gold ; \
-         mv prev-gold stageprofile-gold ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stagefeedback-gold; \
+         mv prev-gold stageprofile-gold; : ; \
        fi
 @endif gold
 @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stagefeedback-intl ; \
-         mv prev-intl stageprofile-intl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stagefeedback-intl; \
+         mv prev-intl stageprofile-intl; : ; \
        fi
 @endif intl
 @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stagefeedback-ld ; \
-         mv prev-ld stageprofile-ld ; :  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stagefeedback-ld; \
+         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 ; :  ; \
+       @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 ; \
-         mv prev-libcpp stageprofile-libcpp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp; \
+         mv prev-libcpp stageprofile-libcpp; : ; \
        fi
 @endif libcpp
 @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber ; \
-         mv prev-libdecnumber stageprofile-libdecnumber ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber; \
+         mv prev-libdecnumber stageprofile-libdecnumber; : ; \
        fi
 @endif libdecnumber
 @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty ; \
-         mv prev-libiberty stageprofile-libiberty ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty; \
+         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 ; :  ; \
+       @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 ; \
-         mv prev-zlib stageprofile-zlib ; :  ; \
+       @if test -d $(HOST_SUBDIR)/zlib; then \
+         cd $(HOST_SUBDIR); mv zlib stagefeedback-zlib; \
+         mv prev-zlib stageprofile-zlib; : ; \
        fi
 @endif zlib
 @if lto-plugin
-       @if test -d $(HOST_SUBDIR)/lto-plugin ; then \
-         cd $(HOST_SUBDIR); mv lto-plugin stagefeedback-lto-plugin ; \
-         mv prev-lto-plugin stageprofile-lto-plugin ; :  ; \
+       @if test -d $(HOST_SUBDIR)/lto-plugin; then \
+         cd $(HOST_SUBDIR); mv lto-plugin stagefeedback-lto-plugin; \
+         mv prev-lto-plugin stageprofile-lto-plugin; : ; \
        fi
 @endif lto-plugin
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; :  ; \
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR); : ; \
        fi
        rm -f stage_current
 
@@ -47848,8 +49367,8 @@ stagefeedback-end::
 stagefeedback-bubble:: stageprofile-bubble
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stagefeedback-lean || test -f stageprofile-lean  ; then \
-         echo Skipping rebuild of stagefeedback ; \
+       if test -f stagefeedback-lean || test -f stageprofile-lean ; then \
+         echo Skipping rebuild of stagefeedback; \
        else \
          $(MAKE) stagefeedback-start; \
          $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback; \
@@ -47908,10 +49427,10 @@ stagefeedback-start::
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        for i in prev-*; do \
-         j=`echo $$i | sed s/^prev-//` ; \
+         j=`echo $$i | sed s/^prev-//`; \
          cd $$r/$$i && \
-         { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL) ; } && \
-         { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL) ; } ; \
+         { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL); } && \
+         { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL); }; \
        done
 
 @if gcc-bootstrap
@@ -47954,6 +49473,12 @@ 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-libmpx: maybe-all-stage1-gcc
+configure-stage2-target-libmpx: maybe-all-stage2-gcc
+configure-stage3-target-libmpx: maybe-all-stage3-gcc
+configure-stage4-target-libmpx: maybe-all-stage4-gcc
+configure-stageprofile-target-libmpx: maybe-all-stageprofile-gcc
+configure-stagefeedback-target-libmpx: 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
@@ -47961,6 +49486,7 @@ 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-liboffloadmic: stage_last
 configure-target-libssp: stage_last
 configure-target-newlib: stage_last
 configure-stage1-target-libgcc: maybe-all-stage1-gcc
@@ -47996,8 +49522,10 @@ configure-target-libatomic: stage_last
 @if gcc-no-bootstrap
 configure-target-libstdc++-v3: maybe-all-gcc
 configure-target-libsanitizer: maybe-all-gcc
+configure-target-libmpx: maybe-all-gcc
 configure-target-libvtv: maybe-all-gcc
 configure-target-libcilkrts: maybe-all-gcc
+configure-target-liboffloadmic: maybe-all-gcc
 configure-target-libssp: maybe-all-gcc
 configure-target-newlib: maybe-all-gcc
 configure-target-libgcc: maybe-all-gcc
@@ -48045,6 +49573,7 @@ all-build-flex: maybe-all-build-m4
 all-build-libiberty: maybe-all-build-texinfo
 all-build-m4: maybe-all-build-texinfo
 all-build-fixincludes: maybe-all-build-libiberty
+all-build-libcpp: maybe-all-build-libiberty
 configure-gcc: maybe-configure-intl
 
 configure-stage1-gcc: maybe-configure-stage1-intl
@@ -48061,6 +49590,30 @@ 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-mpfr
+
+configure-stage1-gcc: maybe-all-stage1-mpfr
+configure-stage2-gcc: maybe-all-stage2-mpfr
+configure-stage3-gcc: maybe-all-stage3-mpfr
+configure-stage4-gcc: maybe-all-stage4-mpfr
+configure-stageprofile-gcc: maybe-all-stageprofile-mpfr
+configure-stagefeedback-gcc: maybe-all-stagefeedback-mpfr
+configure-gcc: maybe-all-mpc
+
+configure-stage1-gcc: maybe-all-stage1-mpc
+configure-stage2-gcc: maybe-all-stage2-mpc
+configure-stage3-gcc: maybe-all-stage3-mpc
+configure-stage4-gcc: maybe-all-stage4-mpc
+configure-stageprofile-gcc: maybe-all-stageprofile-mpc
+configure-stagefeedback-gcc: maybe-all-stagefeedback-mpc
+configure-gcc: maybe-all-isl
+
+configure-stage1-gcc: maybe-all-stage1-isl
+configure-stage2-gcc: maybe-all-stage2-isl
+configure-stage3-gcc: maybe-all-stage3-isl
+configure-stage4-gcc: maybe-all-stage4-isl
+configure-stageprofile-gcc: maybe-all-stageprofile-isl
+configure-stagefeedback-gcc: maybe-all-stagefeedback-isl
 configure-gcc: maybe-all-lto-plugin
 
 configure-stage1-gcc: maybe-all-stage1-lto-plugin
@@ -48141,14 +49694,14 @@ all-stage3-gcc: maybe-all-stage3-mpc
 all-stage4-gcc: maybe-all-stage4-mpc
 all-stageprofile-gcc: maybe-all-stageprofile-mpc
 all-stagefeedback-gcc: maybe-all-stagefeedback-mpc
-all-gcc: maybe-all-cloog
-
-all-stage1-gcc: maybe-all-stage1-cloog
-all-stage2-gcc: maybe-all-stage2-cloog
-all-stage3-gcc: maybe-all-stage3-cloog
-all-stage4-gcc: maybe-all-stage4-cloog
-all-stageprofile-gcc: maybe-all-stageprofile-cloog
-all-stagefeedback-gcc: maybe-all-stagefeedback-cloog
+all-gcc: maybe-all-isl
+
+all-stage1-gcc: maybe-all-stage1-isl
+all-stage2-gcc: maybe-all-stage2-isl
+all-stage3-gcc: maybe-all-stage3-isl
+all-stage4-gcc: maybe-all-stage4-isl
+all-stageprofile-gcc: maybe-all-stageprofile-isl
+all-stagefeedback-gcc: maybe-all-stagefeedback-isl
 all-gcc: maybe-all-build-texinfo
 
 all-stage1-gcc: maybe-all-build-texinfo
@@ -48189,6 +49742,14 @@ all-stage3-gcc: maybe-all-build-fixincludes
 all-stage4-gcc: maybe-all-build-fixincludes
 all-stageprofile-gcc: maybe-all-build-fixincludes
 all-stagefeedback-gcc: maybe-all-build-fixincludes
+all-gcc: maybe-all-build-libcpp
+
+all-stage1-gcc: maybe-all-build-libcpp
+all-stage2-gcc: maybe-all-build-libcpp
+all-stage3-gcc: maybe-all-build-libcpp
+all-stage4-gcc: maybe-all-build-libcpp
+all-stageprofile-gcc: maybe-all-build-libcpp
+all-stagefeedback-gcc: maybe-all-build-libcpp
 all-gcc: maybe-all-zlib
 
 all-stage1-gcc: maybe-all-stage1-zlib
@@ -48339,6 +49900,9 @@ 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
+configure-libcc1: maybe-configure-gcc
+all-libcc1: maybe-all-gcc
+all-gotools: maybe-all-target-libgo
 all-utils: maybe-all-libiberty
 configure-mpfr: maybe-all-gmp
 
@@ -48364,22 +49928,6 @@ configure-stage3-isl: maybe-all-stage3-gmp
 configure-stage4-isl: maybe-all-stage4-gmp
 configure-stageprofile-isl: maybe-all-stageprofile-gmp
 configure-stagefeedback-isl: maybe-all-stagefeedback-gmp
-configure-cloog: maybe-all-isl
-
-configure-stage1-cloog: maybe-all-stage1-isl
-configure-stage2-cloog: maybe-all-stage2-isl
-configure-stage3-cloog: maybe-all-stage3-isl
-configure-stage4-cloog: maybe-all-stage4-isl
-configure-stageprofile-cloog: maybe-all-stageprofile-isl
-configure-stagefeedback-cloog: maybe-all-stagefeedback-isl
-configure-cloog: maybe-all-gmp
-
-configure-stage1-cloog: maybe-all-stage1-gmp
-configure-stage2-cloog: maybe-all-stage2-gmp
-configure-stage3-cloog: maybe-all-stage3-gmp
-configure-stage4-cloog: maybe-all-stage4-gmp
-configure-stageprofile-cloog: maybe-all-stageprofile-gmp
-configure-stagefeedback-cloog: maybe-all-stagefeedback-gmp
 configure-gdb: maybe-all-intl
 configure-gdb: maybe-configure-sim
 configure-gdb: maybe-all-bfd
@@ -48796,6 +50344,7 @@ 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-liboffloadmic: maybe-configure-target-libgomp
 configure-target-libsanitizer: maybe-all-target-libstdc++-v3
 
 configure-stage1-target-libsanitizer: maybe-all-stage1-target-libstdc++-v3
@@ -48820,6 +50369,7 @@ 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
+all-target-liboffloadmic: maybe-all-target-libgomp
 install-target-libgo: maybe-install-target-libatomic
 install-target-libgfortran: maybe-install-target-libquadmath
 install-target-libgfortran: maybe-install-target-libgcc
@@ -48829,6 +50379,8 @@ install-target-libvtv: maybe-install-target-libstdc++-v3
 install-target-libvtv: maybe-install-target-libgcc
 install-target-libcilkrts: maybe-install-target-libstdc++-v3
 install-target-libcilkrts: maybe-install-target-libgcc
+install-target-liboffloadmic: maybe-install-target-libstdc++-v3
+install-target-liboffloadmic: maybe-install-target-libgcc
 install-target-libjava: maybe-install-target-libgcc
 install-target-libitm: maybe-install-target-libgcc
 install-target-libobjc: maybe-install-target-libgcc
@@ -48858,6 +50410,12 @@ 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-libmpx: maybe-all-stage1-target-libgcc
+configure-stage2-target-libmpx: maybe-all-stage2-target-libgcc
+configure-stage3-target-libmpx: maybe-all-stage3-target-libgcc
+configure-stage4-target-libmpx: maybe-all-stage4-target-libgcc
+configure-stageprofile-target-libmpx: maybe-all-stageprofile-target-libgcc
+configure-stagefeedback-target-libmpx: 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
@@ -48875,8 +50433,10 @@ configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-target-libgcc
 @if gcc-no-bootstrap
 configure-target-libstdc++-v3: maybe-all-target-libgcc
 configure-target-libsanitizer: maybe-all-target-libgcc
+configure-target-libmpx: maybe-all-target-libgcc
 configure-target-libvtv: maybe-all-target-libgcc
 configure-target-libcilkrts: maybe-all-target-libgcc
+configure-target-liboffloadmic: maybe-all-target-libgcc
 configure-target-libssp: maybe-all-target-libgcc
 configure-target-newlib: maybe-all-target-libgcc
 configure-target-libbacktrace: maybe-all-target-libgcc
@@ -48903,11 +50463,16 @@ configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-libsanitizer: maybe-all-target-newlib maybe-all-target-libgloss
 
+configure-target-libmpx: maybe-all-target-newlib maybe-all-target-libgloss
+
 configure-target-libvtv: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-libcilkrts: maybe-all-target-newlib maybe-all-target-libgloss
 configure-target-libcilkrts: maybe-all-target-libstdc++-v3
 
+configure-target-liboffloadmic: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-liboffloadmic: maybe-all-target-libstdc++-v3
+
 configure-target-libssp: maybe-all-target-newlib maybe-all-target-libgloss