c-common.c (get_source_date_epoch): Use int64_t instead of long long.

[gcc.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in

index 0a93962c83555ab12fe1120a8d889acd0290e6a1..b74149f4173c191a2ea1cd6b30aae78581c08a02 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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,10 @@ 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; \
+       ISLVER="$(HOST_ISLVER)"; export ISLVER; \
+       LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
+       LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
+       XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
  @if gcc-bootstrap
         $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
  @endif gcc-bootstrap
@@ -287,6 +288,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; \
@@ -311,13 +313,10 @@ NORMAL_TARGET_EXPORTS = \
  HOST_GMPLIBS = @gmplibs@
  HOST_GMPINC = @gmpinc@
  
-# Where to find ISL
+# Where to find isl
  HOST_ISLLIBS = @isllibs@
  HOST_ISLINC = @islinc@
-
-# Where to find CLOOG
-HOST_CLOOGLIBS = @clooglibs@
-HOST_CLOOGINC = @clooginc@
+HOST_ISLVER = @islver@
  
  # Where to find libelf
  HOST_LIBELFLIBS = @libelflibs@
@@ -486,11 +485,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@
@@ -539,6 +536,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@
@@ -580,7 +578,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:
@@ -590,6 +588,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
@@ -598,6 +600,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
@@ -618,7 +624,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
@@ -633,12 +639,12 @@ HOST_LIB_PATH_gmp = \
  
  @if mpfr
  HOST_LIB_PATH_mpfr = \
-  $$r/$(HOST_SUBDIR)/mpfr/.libs:$$r/$(HOST_SUBDIR)/prev-mpfr/.libs:
+  $$r/$(HOST_SUBDIR)/mpfr/src/.libs:$$r/$(HOST_SUBDIR)/prev-mpfr/src/.libs:
  @endif mpfr
  
  @if mpc
  HOST_LIB_PATH_mpc = \
-  $$r/$(HOST_SUBDIR)/mpc/.libs:$$r/$(HOST_SUBDIR)/prev-mpc/.libs:
+  $$r/$(HOST_SUBDIR)/mpc/src/.libs:$$r/$(HOST_SUBDIR)/prev-mpc/src/.libs:
  @endif mpc
  
  @if isl
@@ -646,11 +652,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:
@@ -677,7 +678,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)" \
@@ -758,6 +761,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)" \
@@ -787,7 +791,8 @@ BASE_FLAGS_TO_PASS = \
         $(CXX_FOR_TARGET_FLAG_TO_PASS) \
         "TFLAGS=$(TFLAGS)" \
         "CONFIG_SHELL=$(SHELL)" \
-       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
+       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+       $(if $(LSAN_OPTIONS),"LSAN_OPTIONS=$(LSAN_OPTIONS)")
  
  # We leave this in just in case, but it is not needed anymore.
  RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS)
@@ -832,6 +837,14 @@ POSTSTAGE1_FLAGS_TO_PASS = \
         $(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
@@ -842,7 +855,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)' \
@@ -855,11 +870,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)
@@ -902,7 +920,6 @@ configure-host:  \
      maybe-configure-mpfr \
      maybe-configure-mpc \
      maybe-configure-isl \
-    maybe-configure-cloog \
      maybe-configure-libelf \
      maybe-configure-gold \
      maybe-configure-gprof \
@@ -931,13 +948,16 @@ configure-host:  \
      maybe-configure-utils \
      maybe-configure-gnattools \
      maybe-configure-lto-plugin \
-    maybe-configure-libcc1
+    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 \
@@ -1032,9 +1052,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
@@ -1066,7 +1083,9 @@ all-host: maybe-all-libiberty
  @if libiberty-linker-plugin-no-bootstrap
  all-host: maybe-all-libiberty-linker-plugin
  @endif libiberty-linker-plugin-no-bootstrap
+@if libiconv-no-bootstrap
  all-host: maybe-all-libiconv
+@endif libiconv-no-bootstrap
  all-host: maybe-all-m4
  all-host: maybe-all-readline
  all-host: maybe-all-sid
@@ -1085,9 +1104,8 @@ all-host: maybe-all-gnattools
  @if lto-plugin-no-bootstrap
  all-host: maybe-all-lto-plugin
  @endif lto-plugin-no-bootstrap
-@if libcc1-no-bootstrap
  all-host: maybe-all-libcc1
-@endif libcc1-no-bootstrap
+all-host: maybe-all-gotools
  
  .PHONY: all-target
  
@@ -1097,10 +1115,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
@@ -1158,7 +1180,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
@@ -1188,13 +1209,16 @@ 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
@@ -1243,7 +1267,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
@@ -1273,13 +1296,16 @@ 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
@@ -1328,7 +1354,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
@@ -1358,13 +1383,16 @@ 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
@@ -1413,7 +1441,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
@@ -1443,13 +1470,16 @@ 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
@@ -1498,7 +1528,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
@@ -1528,13 +1557,16 @@ 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
@@ -1583,7 +1615,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
@@ -1613,13 +1644,16 @@ 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
@@ -1668,7 +1702,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
@@ -1698,13 +1731,16 @@ 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
@@ -1753,7 +1789,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
@@ -1783,13 +1818,16 @@ 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
@@ -1838,7 +1876,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
@@ -1868,13 +1905,16 @@ 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
@@ -1923,7 +1963,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
@@ -1953,13 +1992,16 @@ 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
@@ -2008,7 +2050,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
@@ -2038,13 +2079,16 @@ 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
@@ -2093,7 +2137,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
@@ -2123,13 +2166,16 @@ 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
@@ -2178,7 +2224,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
@@ -2208,13 +2253,16 @@ 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
@@ -2255,9 +2303,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
  
@@ -2268,7 +2316,7 @@ local-clean:
  
  local-distclean:
         -rm -f Makefile config.status config.cache mh-frag mt-frag
-       -rm -f maybedep.tmp serdep.tmp
+       -rm -f maybedep.tmp serdep.tmp stage_final
         -if [ "$(TARGET_SUBDIR)" != "." ]; then \
           rm -rf $(TARGET_SUBDIR); \
         else true; fi
@@ -2280,7 +2328,8 @@ local-distclean:
         -rm -f texinfo/doc/Makefile texinfo/po/POTFILES
         -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
         -rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
-       -rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
+       -rmdir fastjar gcc gnattools gotools libcc1 libiberty 2>/dev/null
+       -rmdir texinfo zlib 2>/dev/null
         -find . -name config.cache -exec rm -f {} \; \; 2>/dev/null
  
  local-maintainer-clean:
@@ -2318,7 +2367,6 @@ check-host:  \
      maybe-check-mpfr \
      maybe-check-mpc \
      maybe-check-isl \
-    maybe-check-cloog \
      maybe-check-libelf \
      maybe-check-gold \
      maybe-check-gprof \
@@ -2347,14 +2395,17 @@ check-host:  \
      maybe-check-utils \
      maybe-check-gnattools \
      maybe-check-lto-plugin \
-    maybe-check-libcc1
+    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 \
@@ -2403,6 +2454,27 @@ 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
+
+# clang-format config
+
+$(srcdir)/.clang-format:
+       $(LN_S) contrib/clang-format $@
+
+clang-format: $(srcdir)/.clang-format
+
+.PHONY: clang-format
+
  # Installation targets.
  
  .PHONY: install uninstall
@@ -2429,7 +2501,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 \
@@ -2458,7 +2529,8 @@ install-host-nogcc:  \
      maybe-install-utils \
      maybe-install-gnattools \
      maybe-install-lto-plugin \
-    maybe-install-libcc1
+    maybe-install-libcc1 \
+    maybe-install-gotools
  
  .PHONY: install-host
  install-host:  \
@@ -2478,7 +2550,6 @@ install-host:  \
      maybe-install-mpfr \
      maybe-install-mpc \
      maybe-install-isl \
-    maybe-install-cloog \
      maybe-install-libelf \
      maybe-install-gold \
      maybe-install-gprof \
@@ -2507,14 +2578,17 @@ install-host:  \
      maybe-install-utils \
      maybe-install-gnattools \
      maybe-install-lto-plugin \
-    maybe-install-libcc1
+    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 \
@@ -2541,14 +2615,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
@@ -2583,7 +2657,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 \
@@ -2612,14 +2685,17 @@ install-strip-host:  \
      maybe-install-strip-utils \
      maybe-install-strip-gnattools \
      maybe-install-strip-lto-plugin \
-    maybe-install-strip-libcc1
+    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 \
@@ -2652,10 +2728,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:
@@ -2697,7 +2773,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; \
@@ -2754,7 +2830,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; \
@@ -2811,7 +2887,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; \
@@ -2868,7 +2944,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; \
@@ -2925,7 +3001,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; \
@@ -2982,7 +3058,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; \
@@ -3039,7 +3115,7 @@ configure-build-libcpp:
         @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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libcpp; \
         $(BUILD_EXPORTS)  \
         echo Configuring in $(BUILD_SUBDIR)/libcpp; \
         cd "$(BUILD_SUBDIR)/libcpp" || exit 1; \
@@ -3100,7 +3176,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; \
@@ -3135,8 +3211,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) ;; \
@@ -3168,8 +3244,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) ;; \
@@ -3181,7 +3257,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
  
@@ -3201,8 +3277,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) ;; \
@@ -3214,7 +3290,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
  
@@ -3234,8 +3310,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) ;; \
@@ -3247,7 +3323,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
  
@@ -3267,8 +3343,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) ;; \
@@ -3280,7 +3356,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
  
@@ -3300,8 +3376,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) ;; \
@@ -3313,7 +3389,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
  
@@ -3599,9 +3675,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
  
@@ -3651,7 +3727,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}" \
@@ -3676,7 +3752,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}" \
@@ -3701,7 +3777,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}" \
@@ -3726,7 +3802,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}" \
@@ -3751,7 +3827,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}" \
@@ -3777,7 +3853,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}" \
@@ -3803,7 +3879,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}" \
@@ -3829,7 +3905,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}" \
@@ -3854,7 +3930,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}" \
@@ -3878,7 +3954,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}" \
@@ -3902,7 +3978,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}" \
@@ -3926,7 +4002,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}" \
@@ -3950,7 +4026,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}" \
@@ -3974,7 +4050,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; \
@@ -4009,8 +4085,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) ;; \
@@ -4042,8 +4118,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) ;; \
@@ -4055,7 +4131,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
  
@@ -4075,8 +4151,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) ;; \
@@ -4088,7 +4164,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
  
@@ -4108,8 +4184,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) ;; \
@@ -4121,7 +4197,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
  
@@ -4141,8 +4217,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) ;; \
@@ -4154,7 +4230,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
  
@@ -4174,8 +4250,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) ;; \
@@ -4187,7 +4263,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
  
@@ -4473,9 +4549,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
  
@@ -4525,7 +4601,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}" \
@@ -4550,7 +4626,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}" \
@@ -4575,7 +4651,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}" \
@@ -4600,7 +4676,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}" \
@@ -4625,7 +4701,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}" \
@@ -4651,7 +4727,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}" \
@@ -4677,7 +4753,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}" \
@@ -4703,7 +4779,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}" \
@@ -4728,7 +4804,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}" \
@@ -4752,7 +4828,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}" \
@@ -4776,7 +4852,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}" \
@@ -4800,7 +4876,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}" \
@@ -4824,7 +4900,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}" \
@@ -4848,7 +4924,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; \
@@ -4883,8 +4959,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) ;; \
@@ -4916,8 +4992,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) ;; \
@@ -4929,7 +5005,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
  
@@ -4949,8 +5025,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) ;; \
@@ -4962,7 +5038,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
  
@@ -4982,8 +5058,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) ;; \
@@ -4995,7 +5071,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
  
@@ -5015,8 +5091,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) ;; \
@@ -5028,7 +5104,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
  
@@ -5048,8 +5124,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) ;; \
@@ -5061,7 +5137,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
  
@@ -5347,9 +5423,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
  
@@ -5399,7 +5475,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}" \
@@ -5424,7 +5500,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}" \
@@ -5449,7 +5525,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}" \
@@ -5474,7 +5550,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}" \
@@ -5499,7 +5575,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}" \
@@ -5525,7 +5601,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}" \
@@ -5551,7 +5627,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}" \
@@ -5577,7 +5653,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}" \
@@ -5602,7 +5678,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}" \
@@ -5626,7 +5702,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}" \
@@ -5650,7 +5726,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}" \
@@ -5674,7 +5750,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}" \
@@ -5698,7 +5774,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}" \
@@ -5723,7 +5799,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; \
@@ -5774,12 +5850,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
@@ -5831,7 +5907,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}" \
@@ -5857,7 +5933,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}" \
@@ -5883,7 +5959,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}" \
@@ -5909,7 +5985,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}" \
@@ -5935,7 +6011,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}" \
@@ -5962,7 +6038,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}" \
@@ -5989,7 +6065,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}" \
@@ -6016,7 +6092,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}" \
@@ -6042,7 +6118,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}" \
@@ -6067,7 +6143,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}" \
@@ -6092,7 +6168,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}" \
@@ -6117,7 +6193,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}" \
@@ -6142,7 +6218,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}" \
@@ -6167,7 +6243,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; \
@@ -6219,7 +6295,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)
  
@@ -6272,7 +6348,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}" \
@@ -6298,7 +6374,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}" \
@@ -6324,7 +6400,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}" \
@@ -6350,7 +6426,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}" \
@@ -6376,7 +6452,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}" \
@@ -6403,7 +6479,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}" \
@@ -6430,7 +6506,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}" \
@@ -6457,7 +6533,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}" \
@@ -6483,7 +6559,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}" \
@@ -6508,7 +6584,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}" \
@@ -6533,7 +6609,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}" \
@@ -6558,7 +6634,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}" \
@@ -6583,7 +6659,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}" \
@@ -6608,7 +6684,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; \
@@ -6660,7 +6736,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)
  
@@ -6713,7 +6789,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}" \
@@ -6739,7 +6815,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}" \
@@ -6765,7 +6841,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}" \
@@ -6791,7 +6867,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}" \
@@ -6817,7 +6893,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}" \
@@ -6844,7 +6920,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}" \
@@ -6871,7 +6947,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}" \
@@ -6898,7 +6974,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}" \
@@ -6924,7 +7000,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}" \
@@ -6949,7 +7025,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}" \
@@ -6974,7 +7050,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}" \
@@ -6999,7 +7075,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}" \
@@ -7024,7 +7100,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}" \
@@ -7049,7 +7125,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; \
@@ -7101,7 +7177,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)
  
@@ -7154,7 +7230,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}" \
@@ -7180,7 +7256,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}" \
@@ -7206,7 +7282,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}" \
@@ -7232,7 +7308,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}" \
@@ -7258,7 +7334,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}" \
@@ -7285,7 +7361,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}" \
@@ -7312,7 +7388,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}" \
@@ -7339,7 +7415,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}" \
@@ -7365,7 +7441,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}" \
@@ -7390,7 +7466,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}" \
@@ -7415,7 +7491,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}" \
@@ -7440,7 +7516,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}" \
@@ -7465,7 +7541,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}" \
@@ -7490,7 +7566,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; \
@@ -7541,12 +7617,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
@@ -7598,7 +7674,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}" \
@@ -7624,7 +7700,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}" \
@@ -7650,7 +7726,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}" \
@@ -7676,7 +7752,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}" \
@@ -7702,7 +7778,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}" \
@@ -7729,7 +7805,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}" \
@@ -7756,7 +7832,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}" \
@@ -7783,7 +7859,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}" \
@@ -7809,7 +7885,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}" \
@@ -7834,7 +7910,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}" \
@@ -7859,7 +7935,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}" \
@@ -7884,7 +7960,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}" \
@@ -7909,7 +7985,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}" \
@@ -7933,7 +8009,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; \
@@ -7968,8 +8044,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) ;; \
@@ -8001,8 +8077,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) ;; \
@@ -8014,7 +8090,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
  
@@ -8034,8 +8110,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) ;; \
@@ -8047,7 +8123,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
  
@@ -8067,8 +8143,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) ;; \
@@ -8080,7 +8156,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
  
@@ -8100,8 +8176,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) ;; \
@@ -8113,7 +8189,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
  
@@ -8133,8 +8209,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) ;; \
@@ -8146,7 +8222,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
  
@@ -8432,9 +8508,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
  
@@ -8484,7 +8560,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}" \
@@ -8509,7 +8585,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}" \
@@ -8534,7 +8610,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}" \
@@ -8559,7 +8635,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}" \
@@ -8595,7 +8671,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}" \
@@ -8621,7 +8697,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}" \
@@ -8647,7 +8723,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}" \
@@ -8672,7 +8748,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}" \
@@ -8696,7 +8772,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}" \
@@ -8720,7 +8796,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}" \
@@ -8744,7 +8820,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}" \
@@ -8768,7 +8844,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}" \
@@ -8793,7 +8869,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; \
@@ -8844,12 +8920,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
@@ -8901,7 +8977,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}" \
@@ -8927,7 +9003,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}" \
@@ -8953,7 +9029,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}" \
@@ -8979,7 +9055,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}" \
@@ -9005,7 +9081,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}" \
@@ -9032,7 +9108,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}" \
@@ -9059,7 +9135,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}" \
@@ -9086,7 +9162,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}" \
@@ -9112,7 +9188,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}" \
@@ -9137,7 +9213,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}" \
@@ -9162,7 +9238,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}" \
@@ -9187,7 +9263,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}" \
@@ -9212,7 +9288,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}" \
@@ -9236,7 +9312,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; \
@@ -9271,8 +9347,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) ;; \
@@ -9304,8 +9380,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) ;; \
@@ -9317,7 +9393,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
  
@@ -9337,8 +9413,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) ;; \
@@ -9350,7 +9426,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
  
@@ -9370,8 +9446,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) ;; \
@@ -9383,7 +9459,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
  
@@ -9403,8 +9479,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) ;; \
@@ -9416,7 +9492,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
  
@@ -9436,8 +9512,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) ;; \
@@ -9449,7 +9525,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
  
@@ -9735,9 +9811,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
  
@@ -9787,7 +9863,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}" \
@@ -9812,7 +9888,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}" \
@@ -9837,7 +9913,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}" \
@@ -9862,7 +9938,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}" \
@@ -9887,7 +9963,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}" \
@@ -9913,7 +9989,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}" \
@@ -9939,7 +10015,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}" \
@@ -9965,7 +10041,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}" \
@@ -9990,7 +10066,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}" \
@@ -10014,7 +10090,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}" \
@@ -10038,7 +10114,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}" \
@@ -10062,7 +10138,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}" \
@@ -10086,7 +10162,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}" \
@@ -10110,7 +10186,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; \
@@ -10145,8 +10221,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) ;; \
@@ -10178,8 +10254,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) ;; \
@@ -10191,7 +10267,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
  
@@ -10211,8 +10287,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) ;; \
@@ -10224,7 +10300,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
  
@@ -10244,8 +10320,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) ;; \
@@ -10257,7 +10333,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
  
@@ -10277,8 +10353,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) ;; \
@@ -10290,7 +10366,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
  
@@ -10310,8 +10386,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) ;; \
@@ -10323,7 +10399,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
  
@@ -10609,9 +10685,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
  
@@ -10661,7 +10737,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}" \
@@ -10686,7 +10762,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}" \
@@ -10711,7 +10787,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}" \
@@ -10736,7 +10812,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}" \
@@ -10761,7 +10837,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}" \
@@ -10787,7 +10863,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}" \
@@ -10813,7 +10889,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}" \
@@ -10839,7 +10915,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}" \
@@ -10864,7 +10940,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}" \
@@ -10888,7 +10964,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}" \
@@ -10912,7 +10988,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}" \
@@ -10936,7 +11012,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}" \
@@ -10960,7 +11036,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}" \
@@ -10984,7 +11060,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; \
@@ -10998,7 +11074,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
  
@@ -11019,8 +11095,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) ;; \
@@ -11034,7 +11110,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
@@ -11053,8 +11129,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) ;; \
@@ -11066,9 +11142,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
@@ -11087,8 +11163,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) ;; \
@@ -11100,9 +11176,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
@@ -11121,8 +11197,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) ;; \
@@ -11134,9 +11210,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
@@ -11155,8 +11231,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) ;; \
@@ -11168,9 +11244,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
@@ -11189,8 +11265,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) ;; \
@@ -11202,9 +11278,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
  
  
@@ -11224,7 +11300,7 @@ all-gmp: configure-gmp
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/gmp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 $(TARGET-gmp))
  @endif gmp
  
@@ -11253,7 +11329,7 @@ all-stage1-gmp: configure-stage1-gmp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
-               $(STAGE1_FLAGS_TO_PASS)  \
+               $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 TFLAGS="$(STAGE1_TFLAGS)" \
                 $(TARGET-stage1-gmp)
  
@@ -11268,7 +11344,7 @@ clean-stage1-gmp:
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-       $(STAGE1_FLAGS_TO_PASS)  clean
+       $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -11295,7 +11371,7 @@ all-stage2-gmp: configure-stage2-gmp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 TFLAGS="$(STAGE2_TFLAGS)" \
                 $(TARGET-stage2-gmp)
  
@@ -11309,7 +11385,7 @@ clean-stage2-gmp:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -11336,7 +11412,7 @@ all-stage3-gmp: configure-stage3-gmp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 TFLAGS="$(STAGE3_TFLAGS)" \
                 $(TARGET-stage3-gmp)
  
@@ -11350,7 +11426,7 @@ clean-stage3-gmp:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -11377,7 +11453,7 @@ all-stage4-gmp: configure-stage4-gmp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 TFLAGS="$(STAGE4_TFLAGS)" \
                 $(TARGET-stage4-gmp)
  
@@ -11391,7 +11467,7 @@ clean-stage4-gmp:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -11418,7 +11494,7 @@ all-stageprofile-gmp: configure-stageprofile-gmp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 TFLAGS="$(STAGEprofile_TFLAGS)" \
                 $(TARGET-stageprofile-gmp)
  
@@ -11432,7 +11508,7 @@ clean-stageprofile-gmp:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -11459,7 +11535,7 @@ all-stagefeedback-gmp: configure-stagefeedback-gmp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 TFLAGS="$(STAGEfeedback_TFLAGS)" \
                 $(TARGET-stagefeedback-gmp)
  
@@ -11473,7 +11549,7 @@ clean-stagefeedback-gmp:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -11489,9 +11565,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) AM_CFLAGS="-DNO_ASM" $(EXTRA_BOOTSTRAP_FLAGS) check)
  
  @endif gmp
  
@@ -11526,10 +11602,10 @@ info-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11551,10 +11627,10 @@ dvi-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11576,10 +11652,10 @@ pdf-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11601,10 +11677,10 @@ html-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11626,10 +11702,10 @@ TAGS-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11652,10 +11728,10 @@ install-info-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11678,10 +11754,10 @@ install-pdf-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11704,10 +11780,10 @@ install-html-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11729,10 +11805,10 @@ installcheck-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11753,10 +11829,10 @@ mostlyclean-gmp:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11777,10 +11853,10 @@ clean-gmp:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11801,10 +11877,10 @@ distclean-gmp:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11825,10 +11901,10 @@ maintainer-clean-gmp:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -11852,7 +11928,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; \
@@ -11887,8 +11963,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) ;; \
@@ -11921,8 +11997,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) ;; \
@@ -11934,7 +12010,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
@@ -11955,8 +12031,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) ;; \
@@ -11968,7 +12044,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
@@ -11989,8 +12065,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) ;; \
@@ -12002,7 +12078,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
@@ -12023,8 +12099,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) ;; \
@@ -12036,7 +12112,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
@@ -12057,8 +12133,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) ;; \
@@ -12070,7 +12146,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
@@ -12092,7 +12168,7 @@ all-mpfr: configure-mpfr
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/mpfr && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 $(TARGET-mpfr))
  @endif mpfr
  
@@ -12121,7 +12197,7 @@ all-stage1-mpfr: configure-stage1-mpfr
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
-               $(STAGE1_FLAGS_TO_PASS)  \
+               $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 TFLAGS="$(STAGE1_TFLAGS)" \
                 $(TARGET-stage1-mpfr)
  
@@ -12136,7 +12212,7 @@ clean-stage1-mpfr:
         fi; \
         cd $(HOST_SUBDIR)/mpfr && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-       $(STAGE1_FLAGS_TO_PASS)  clean
+       $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif mpfr-bootstrap
  
  
@@ -12163,7 +12239,7 @@ all-stage2-mpfr: configure-stage2-mpfr
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 TFLAGS="$(STAGE2_TFLAGS)" \
                 $(TARGET-stage2-mpfr)
  
@@ -12177,7 +12253,7 @@ clean-stage2-mpfr:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif mpfr-bootstrap
  
  
@@ -12204,7 +12280,7 @@ all-stage3-mpfr: configure-stage3-mpfr
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 TFLAGS="$(STAGE3_TFLAGS)" \
                 $(TARGET-stage3-mpfr)
  
@@ -12218,7 +12294,7 @@ clean-stage3-mpfr:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif mpfr-bootstrap
  
  
@@ -12245,7 +12321,7 @@ all-stage4-mpfr: configure-stage4-mpfr
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 TFLAGS="$(STAGE4_TFLAGS)" \
                 $(TARGET-stage4-mpfr)
  
@@ -12259,7 +12335,7 @@ clean-stage4-mpfr:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif mpfr-bootstrap
  
  
@@ -12286,7 +12362,7 @@ all-stageprofile-mpfr: configure-stageprofile-mpfr
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 TFLAGS="$(STAGEprofile_TFLAGS)" \
                 $(TARGET-stageprofile-mpfr)
  
@@ -12300,7 +12376,7 @@ clean-stageprofile-mpfr:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif mpfr-bootstrap
  
  
@@ -12327,7 +12403,7 @@ all-stagefeedback-mpfr: configure-stagefeedback-mpfr
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 TFLAGS="$(STAGEfeedback_TFLAGS)" \
                 $(TARGET-stagefeedback-mpfr)
  
@@ -12341,7 +12417,7 @@ clean-stagefeedback-mpfr:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif mpfr-bootstrap
  
  
@@ -12357,9 +12433,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) AM_CFLAGS="-DNO_ASM" $(EXTRA_BOOTSTRAP_FLAGS) check)
  
  @endif mpfr
  
@@ -12394,10 +12470,10 @@ info-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12419,10 +12495,10 @@ dvi-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12444,10 +12520,10 @@ pdf-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12469,10 +12545,10 @@ html-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12494,10 +12570,10 @@ TAGS-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12520,10 +12596,10 @@ install-info-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12546,10 +12622,10 @@ install-pdf-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12572,10 +12648,10 @@ install-html-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12597,10 +12673,10 @@ installcheck-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12621,10 +12697,10 @@ mostlyclean-mpfr:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12645,10 +12721,10 @@ clean-mpfr:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12669,10 +12745,10 @@ distclean-mpfr:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12693,10 +12769,10 @@ maintainer-clean-mpfr:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; 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}" \
@@ -12720,7 +12796,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; \
@@ -12755,8 +12831,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) ;; \
@@ -12789,8 +12865,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) ;; \
@@ -12802,7 +12878,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
@@ -12823,8 +12899,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) ;; \
@@ -12836,7 +12912,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
@@ -12857,8 +12933,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) ;; \
@@ -12870,7 +12946,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
@@ -12891,8 +12967,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) ;; \
@@ -12904,7 +12980,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
@@ -12925,8 +13001,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) ;; \
@@ -12938,7 +13014,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
@@ -13225,9 +13301,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
  
@@ -13265,7 +13341,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}" \
@@ -13290,7 +13366,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}" \
@@ -13315,7 +13391,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}" \
@@ -13340,7 +13416,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}" \
@@ -13365,7 +13441,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}" \
@@ -13391,7 +13467,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}" \
@@ -13417,7 +13493,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}" \
@@ -13443,7 +13519,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}" \
@@ -13468,7 +13544,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}" \
@@ -13492,7 +13568,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}" \
@@ -13516,7 +13592,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}" \
@@ -13540,7 +13616,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}" \
@@ -13564,7 +13640,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}" \
@@ -13588,7 +13664,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; \
@@ -13623,8 +13699,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) ;; \
@@ -13657,8 +13733,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) ;; \
@@ -13670,7 +13746,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
@@ -13691,8 +13767,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) ;; \
@@ -13704,7 +13780,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
@@ -13725,8 +13801,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) ;; \
@@ -13738,7 +13814,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
@@ -13759,8 +13835,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) ;; \
@@ -13772,7 +13848,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
@@ -13793,8 +13869,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) ;; \
@@ -13806,7 +13882,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
@@ -14093,9 +14169,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
  
@@ -14133,7 +14209,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}" \
@@ -14158,7 +14234,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}" \
@@ -14183,7 +14259,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}" \
@@ -14208,7 +14284,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}" \
@@ -14233,7 +14309,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}" \
@@ -14259,7 +14335,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}" \
@@ -14285,7 +14361,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}" \
@@ -14311,7 +14387,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}" \
@@ -14336,7 +14412,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}" \
@@ -14360,7 +14436,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}" \
@@ -14384,7 +14460,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}" \
@@ -14408,7 +14484,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}" \
@@ -14432,7 +14508,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}" \
@@ -14445,278 +14521,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)" \
@@ -14725,41 +14801,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)" \
@@ -14767,40 +14843,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)" \
@@ -14808,40 +14884,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)" \
@@ -14849,40 +14925,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)" \
@@ -14890,40 +14966,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)" \
@@ -14931,78 +15007,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}" \
@@ -15010,24 +15086,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}" \
@@ -15035,24 +15111,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}" \
@@ -15060,24 +15136,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}" \
@@ -15085,24 +15161,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}" \
@@ -15110,25 +15186,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}" \
@@ -15136,25 +15212,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}" \
@@ -15162,25 +15238,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}" \
@@ -15188,24 +15264,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}" \
@@ -15213,23 +15289,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}" \
@@ -15237,23 +15313,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}" \
@@ -15261,23 +15337,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}" \
@@ -15285,23 +15361,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}" \
@@ -15309,282 +15385,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: 
-       @r=`${PWD_COMMAND}`; export r; \
+@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:
+.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)/libelf
+       @$(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)" \
@@ -15595,39 +15665,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)" \
@@ -15637,38 +15707,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)" \
@@ -15678,38 +15748,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)" \
@@ -15719,38 +15789,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)" \
@@ -15760,38 +15830,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)" \
@@ -15801,76 +15871,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}" \
@@ -15878,24 +15960,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}" \
@@ -15903,24 +15985,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}" \
@@ -15928,24 +16010,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}" \
@@ -15953,24 +16035,24 @@ html-libelf: \
                   html) \
           || exit 1
  
-@endif libelf
+@endif gold
  
-.PHONY: maybe-TAGS-libelf TAGS-libelf
-maybe-TAGS-libelf:
-@if libelf
-maybe-TAGS-libelf: TAGS-libelf
+.PHONY: maybe-TAGS-gold TAGS-gold
+maybe-TAGS-gold:
+@if gold
+maybe-TAGS-gold: TAGS-gold
  
-TAGS-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+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}" \
@@ -15978,25 +16060,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}" \
@@ -16004,25 +16086,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}" \
@@ -16030,25 +16112,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}" \
@@ -16056,24 +16138,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}" \
@@ -16081,23 +16163,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}" \
@@ -16105,23 +16187,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}" \
@@ -16129,23 +16211,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}" \
@@ -16153,23 +16235,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}" \
@@ -16177,574 +16259,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
-
-.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
-       @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
+@endif gprof
  
  
  
  
  
-.PHONY: all-gold maybe-all-gold
-maybe-all-gold:
+.PHONY: all-gprof maybe-all-gprof
+maybe-all-gprof:
  @if gcc-bootstrap
-all-gold: stage_current
+all-gprof: stage_current
  @endif gcc-bootstrap
-@if gold
-TARGET-gold=all
-maybe-all-gold: all-gold
-all-gold: configure-gold
+@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)/gold && \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-gold))
-@endif gold
+               $(TARGET-gprof))
+@endif 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
+
+.PHONY: check-gprof maybe-check-gprof
+maybe-check-gprof:
+@if gprof
+maybe-check-gprof: check-gprof
+
+check-gprof:
+       @: $(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)
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-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-gprof maybe-install-gprof
+maybe-install-gprof:
+@if gprof
+maybe-install-gprof: install-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-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)
  
-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
  
+.PHONY: install-strip-gprof maybe-install-strip-gprof
+maybe-install-strip-gprof:
+@if gprof
+maybe-install-strip-gprof: install-strip-gprof
  
-.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
+install-strip-gprof: installdirs
+       @: $(MAKE); $(unstage)
         @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 && \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(FLAGS_TO_PASS)  install-strip)
  
-@endif gold
+@endif gprof
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-gold info-gold
-maybe-info-gold:
-@if gold
-maybe-info-gold: info-gold
+.PHONY: maybe-info-gprof info-gprof
+maybe-info-gprof:
+@if gprof
+maybe-info-gprof: info-gprof
  
-info-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+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}" \
@@ -16752,24 +16389,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}" \
@@ -16777,24 +16415,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}" \
@@ -16802,24 +16441,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}" \
@@ -16827,24 +16467,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}" \
@@ -16852,25 +16493,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}" \
@@ -16878,25 +16520,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}" \
@@ -16904,25 +16547,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}" \
@@ -16930,24 +16574,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}" \
@@ -16955,23 +16600,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}" \
@@ -16979,23 +16625,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}" \
@@ -17003,23 +16650,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}" \
@@ -17027,23 +16675,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}" \
@@ -17051,499 +16700,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) ;; \
@@ -17575,8 +16783,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) ;; \
@@ -17588,7 +16796,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
  
@@ -17608,8 +16816,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) ;; \
@@ -17621,7 +16829,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
  
@@ -17641,8 +16849,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) ;; \
@@ -17654,7 +16862,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
  
@@ -17674,8 +16882,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) ;; \
@@ -17687,7 +16895,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
  
@@ -17707,8 +16915,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) ;; \
@@ -17720,7 +16928,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
  
@@ -18006,9 +17214,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
  
@@ -18058,7 +17266,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}" \
@@ -18083,7 +17291,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}" \
@@ -18108,7 +17316,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}" \
@@ -18133,7 +17341,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}" \
@@ -18158,7 +17366,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}" \
@@ -18184,7 +17392,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}" \
@@ -18210,7 +17418,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}" \
@@ -18236,7 +17444,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}" \
@@ -18261,7 +17469,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}" \
@@ -18285,7 +17493,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}" \
@@ -18309,7 +17517,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}" \
@@ -18333,7 +17541,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}" \
@@ -18357,7 +17565,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}" \
@@ -18382,7 +17590,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; \
@@ -18434,7 +17642,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)
  
@@ -18487,7 +17695,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}" \
@@ -18513,7 +17721,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}" \
@@ -18539,7 +17747,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}" \
@@ -18565,7 +17773,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}" \
@@ -18591,7 +17799,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}" \
@@ -18618,7 +17826,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}" \
@@ -18645,7 +17853,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}" \
@@ -18672,7 +17880,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}" \
@@ -18698,7 +17906,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}" \
@@ -18733,7 +17941,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}" \
@@ -18758,7 +17966,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}" \
@@ -18783,7 +17991,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}" \
@@ -18808,7 +18016,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; \
@@ -18860,7 +18068,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)
  
@@ -18913,7 +18121,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}" \
@@ -18939,7 +18147,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}" \
@@ -18965,7 +18173,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}" \
@@ -18991,7 +18199,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}" \
@@ -19017,7 +18225,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}" \
@@ -19044,7 +18252,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}" \
@@ -19071,7 +18279,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}" \
@@ -19098,7 +18306,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}" \
@@ -19124,7 +18332,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}" \
@@ -19149,7 +18357,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}" \
@@ -19174,7 +18382,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}" \
@@ -19199,7 +18407,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}" \
@@ -19224,7 +18432,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}" \
@@ -19248,7 +18456,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; \
@@ -19283,8 +18491,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) ;; \
@@ -19316,8 +18524,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) ;; \
@@ -19329,7 +18537,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
  
@@ -19349,8 +18557,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) ;; \
@@ -19362,7 +18570,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
  
@@ -19382,8 +18590,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) ;; \
@@ -19395,7 +18603,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
  
@@ -19415,8 +18623,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) ;; \
@@ -19428,7 +18636,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
  
@@ -19448,8 +18656,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) ;; \
@@ -19461,7 +18669,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
  
@@ -19747,9 +18955,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
  
@@ -19799,7 +19007,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}" \
@@ -19824,7 +19032,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}" \
@@ -19849,7 +19057,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}" \
@@ -19874,7 +19082,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}" \
@@ -19899,7 +19107,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}" \
@@ -19925,7 +19133,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}" \
@@ -19951,7 +19159,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}" \
@@ -19977,7 +19185,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}" \
@@ -20002,7 +19210,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}" \
@@ -20026,7 +19234,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}" \
@@ -20050,7 +19258,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}" \
@@ -20074,7 +19282,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}" \
@@ -20098,7 +19306,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}" \
@@ -20122,7 +19330,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; \
@@ -20157,8 +19365,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) ;; \
@@ -20190,8 +19398,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) ;; \
@@ -20203,7 +19411,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
  
@@ -20223,8 +19431,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) ;; \
@@ -20236,7 +19444,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
  
@@ -20256,8 +19464,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) ;; \
@@ -20269,7 +19477,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
  
@@ -20289,8 +19497,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) ;; \
@@ -20302,7 +19510,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
  
@@ -20322,8 +19530,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) ;; \
@@ -20335,7 +19543,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
  
@@ -20621,9 +19829,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
  
@@ -20673,7 +19881,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}" \
@@ -20698,7 +19906,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}" \
@@ -20723,7 +19931,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}" \
@@ -20748,7 +19956,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}" \
@@ -20773,7 +19981,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}" \
@@ -20799,7 +20007,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}" \
@@ -20825,7 +20033,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}" \
@@ -20851,7 +20059,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}" \
@@ -20876,7 +20084,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}" \
@@ -20900,7 +20108,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}" \
@@ -20924,7 +20132,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}" \
@@ -20948,7 +20156,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}" \
@@ -20972,7 +20180,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}" \
@@ -20996,7 +20204,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; \
@@ -21031,8 +20239,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) ;; \
@@ -21064,8 +20272,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) ;; \
@@ -21077,7 +20285,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
  
@@ -21097,8 +20305,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) ;; \
@@ -21110,7 +20318,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
  
@@ -21130,8 +20338,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) ;; \
@@ -21143,7 +20351,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
  
@@ -21163,8 +20371,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) ;; \
@@ -21176,7 +20384,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
  
@@ -21196,8 +20404,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) ;; \
@@ -21209,7 +20417,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
  
@@ -21495,9 +20703,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
  
@@ -21547,7 +20755,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}" \
@@ -21572,7 +20780,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}" \
@@ -21597,7 +20805,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}" \
@@ -21622,7 +20830,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}" \
@@ -21647,7 +20855,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}" \
@@ -21673,7 +20881,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}" \
@@ -21699,7 +20907,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}" \
@@ -21725,7 +20933,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}" \
@@ -21750,7 +20958,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}" \
@@ -21774,7 +20982,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}" \
@@ -21798,7 +21006,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}" \
@@ -21822,7 +21030,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}" \
@@ -21846,7 +21054,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}" \
@@ -21870,7 +21078,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; \
@@ -21905,8 +21113,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) ;; \
@@ -21938,8 +21146,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) ;; \
@@ -21951,7 +21159,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
  
@@ -21971,8 +21179,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) ;; \
@@ -21984,7 +21192,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
  
@@ -22004,8 +21212,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) ;; \
@@ -22017,7 +21225,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
  
@@ -22037,8 +21245,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) ;; \
@@ -22050,7 +21258,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
  
@@ -22070,8 +21278,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) ;; \
@@ -22083,7 +21291,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
  
@@ -22369,9 +21577,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
  
@@ -22421,7 +21629,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}" \
@@ -22446,7 +21654,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}" \
@@ -22471,7 +21679,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}" \
@@ -22496,7 +21704,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}" \
@@ -22521,7 +21729,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}" \
@@ -22547,7 +21755,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}" \
@@ -22573,7 +21781,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}" \
@@ -22599,7 +21807,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}" \
@@ -22624,7 +21832,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}" \
@@ -22648,7 +21856,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}" \
@@ -22672,7 +21880,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}" \
@@ -22696,7 +21904,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}" \
@@ -22720,7 +21928,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}" \
@@ -22745,7 +21953,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; \
@@ -22797,7 +22005,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)
  
@@ -22850,7 +22058,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}" \
@@ -22876,7 +22084,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}" \
@@ -22902,7 +22110,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}" \
@@ -22928,7 +22136,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}" \
@@ -22954,7 +22162,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}" \
@@ -22981,7 +22189,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}" \
@@ -23008,7 +22216,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}" \
@@ -23035,7 +22243,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}" \
@@ -23061,7 +22269,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}" \
@@ -23086,7 +22294,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}" \
@@ -23111,7 +22319,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}" \
@@ -23136,7 +22344,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}" \
@@ -23161,7 +22369,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}" \
@@ -23185,7 +22393,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; \
@@ -23220,8 +22428,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) ;; \
@@ -23254,8 +22462,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) ;; \
@@ -23267,7 +22475,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
@@ -23288,8 +22496,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) ;; \
@@ -23301,7 +22509,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
@@ -23322,8 +22530,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) ;; \
@@ -23335,7 +22543,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
@@ -23356,8 +22564,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) ;; \
@@ -23369,7 +22577,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
@@ -23390,8 +22598,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) ;; \
@@ -23403,7 +22611,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
@@ -23690,9 +22898,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
  
@@ -23742,7 +22950,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}" \
@@ -23767,7 +22975,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}" \
@@ -23792,7 +23000,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}" \
@@ -23817,7 +23025,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}" \
@@ -23842,7 +23050,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}" \
@@ -23868,7 +23076,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}" \
@@ -23894,7 +23102,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}" \
@@ -23920,7 +23128,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}" \
@@ -23945,7 +23153,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}" \
@@ -23969,7 +23177,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}" \
@@ -23993,7 +23201,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}" \
@@ -24017,7 +23225,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}" \
@@ -24041,7 +23249,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}" \
@@ -24065,7 +23273,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; \
@@ -24100,8 +23308,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) ;; \
@@ -24134,8 +23342,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) ;; \
@@ -24147,7 +23355,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
@@ -24168,8 +23376,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) ;; \
@@ -24181,7 +23389,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
@@ -24202,8 +23410,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) ;; \
@@ -24215,7 +23423,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
@@ -24236,8 +23444,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) ;; \
@@ -24249,7 +23457,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
@@ -24270,8 +23478,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) ;; \
@@ -24283,7 +23491,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
@@ -24570,9 +23778,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
  
@@ -24622,7 +23830,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}" \
@@ -24647,7 +23855,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}" \
@@ -24672,7 +23880,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}" \
@@ -24697,7 +23905,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}" \
@@ -24722,7 +23930,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}" \
@@ -24748,7 +23956,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}" \
@@ -24774,7 +23982,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}" \
@@ -24800,7 +24008,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}" \
@@ -24825,7 +24033,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}" \
@@ -24849,7 +24057,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}" \
@@ -24873,7 +24081,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}" \
@@ -24897,7 +24105,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}" \
@@ -24921,7 +24129,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}" \
@@ -24942,11 +24150,10 @@ configure-libiconv: stage_current
  @if libiconv
  maybe-configure-libiconv: configure-libiconv
  configure-libiconv: 
-       @: $(MAKE); $(unstage)
         @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; \
@@ -24966,6 +24173,211 @@ configure-libiconv:
  
  
  
+.PHONY: configure-stage1-libiconv maybe-configure-stage1-libiconv
+maybe-configure-stage1-libiconv:
+@if libiconv-bootstrap
+maybe-configure-stage1-libiconv: configure-stage1-libiconv
+configure-stage1-libiconv:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiconv/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)/libiconv; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \
+       cd $(HOST_SUBDIR)/libiconv || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiconv; \
+       $(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 libiconv-bootstrap
+
+.PHONY: configure-stage2-libiconv maybe-configure-stage2-libiconv
+maybe-configure-stage2-libiconv:
+@if libiconv-bootstrap
+maybe-configure-stage2-libiconv: configure-stage2-libiconv
+configure-stage2-libiconv:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiconv/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)/libiconv; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \
+       cd $(HOST_SUBDIR)/libiconv || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiconv; \
+       $(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 libiconv-bootstrap
+
+.PHONY: configure-stage3-libiconv maybe-configure-stage3-libiconv
+maybe-configure-stage3-libiconv:
+@if libiconv-bootstrap
+maybe-configure-stage3-libiconv: configure-stage3-libiconv
+configure-stage3-libiconv:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiconv/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)/libiconv; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \
+       cd $(HOST_SUBDIR)/libiconv || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiconv; \
+       $(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 libiconv-bootstrap
+
+.PHONY: configure-stage4-libiconv maybe-configure-stage4-libiconv
+maybe-configure-stage4-libiconv:
+@if libiconv-bootstrap
+maybe-configure-stage4-libiconv: configure-stage4-libiconv
+configure-stage4-libiconv:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiconv/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)/libiconv; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \
+       cd $(HOST_SUBDIR)/libiconv || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiconv; \
+       $(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 libiconv-bootstrap
+
+.PHONY: configure-stageprofile-libiconv maybe-configure-stageprofile-libiconv
+maybe-configure-stageprofile-libiconv:
+@if libiconv-bootstrap
+maybe-configure-stageprofile-libiconv: configure-stageprofile-libiconv
+configure-stageprofile-libiconv:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiconv/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)/libiconv; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \
+       cd $(HOST_SUBDIR)/libiconv || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiconv; \
+       $(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 libiconv-bootstrap
+
+.PHONY: configure-stagefeedback-libiconv maybe-configure-stagefeedback-libiconv
+maybe-configure-stagefeedback-libiconv:
+@if libiconv-bootstrap
+maybe-configure-stagefeedback-libiconv: configure-stagefeedback-libiconv
+configure-stagefeedback-libiconv:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiconv/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)/libiconv; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \
+       cd $(HOST_SUBDIR)/libiconv || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiconv; \
+       $(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 libiconv-bootstrap
+
+
+
  
  
  .PHONY: all-libiconv maybe-all-libiconv
@@ -24977,7 +24389,6 @@ all-libiconv: stage_current
  TARGET-libiconv=all
  maybe-all-libiconv: all-libiconv
  all-libiconv: configure-libiconv
-       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
@@ -24988,6 +24399,255 @@ all-libiconv: configure-libiconv
  
  
  
+.PHONY: all-stage1-libiconv maybe-all-stage1-libiconv
+.PHONY: clean-stage1-libiconv maybe-clean-stage1-libiconv
+maybe-all-stage1-libiconv:
+maybe-clean-stage1-libiconv:
+@if libiconv-bootstrap
+maybe-all-stage1-libiconv: all-stage1-libiconv
+all-stage1: all-stage1-libiconv
+TARGET-stage1-libiconv = $(TARGET-libiconv)
+all-stage1-libiconv: configure-stage1-libiconv
+       @[ $(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)/libiconv && \
+       $(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-libiconv)
+
+maybe-clean-stage1-libiconv: clean-stage1-libiconv
+clean-stage1: clean-stage1-libiconv
+clean-stage1-libiconv:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-libiconv/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiconv && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libiconv-bootstrap
+
+
+.PHONY: all-stage2-libiconv maybe-all-stage2-libiconv
+.PHONY: clean-stage2-libiconv maybe-clean-stage2-libiconv
+maybe-all-stage2-libiconv:
+maybe-clean-stage2-libiconv:
+@if libiconv-bootstrap
+maybe-all-stage2-libiconv: all-stage2-libiconv
+all-stage2: all-stage2-libiconv
+TARGET-stage2-libiconv = $(TARGET-libiconv)
+all-stage2-libiconv: configure-stage2-libiconv
+       @[ $(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)/libiconv && \
+       $(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-libiconv)
+
+maybe-clean-stage2-libiconv: clean-stage2-libiconv
+clean-stage2: clean-stage2-libiconv
+clean-stage2-libiconv:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-libiconv/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiconv && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiconv-bootstrap
+
+
+.PHONY: all-stage3-libiconv maybe-all-stage3-libiconv
+.PHONY: clean-stage3-libiconv maybe-clean-stage3-libiconv
+maybe-all-stage3-libiconv:
+maybe-clean-stage3-libiconv:
+@if libiconv-bootstrap
+maybe-all-stage3-libiconv: all-stage3-libiconv
+all-stage3: all-stage3-libiconv
+TARGET-stage3-libiconv = $(TARGET-libiconv)
+all-stage3-libiconv: configure-stage3-libiconv
+       @[ $(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)/libiconv && \
+       $(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-libiconv)
+
+maybe-clean-stage3-libiconv: clean-stage3-libiconv
+clean-stage3: clean-stage3-libiconv
+clean-stage3-libiconv:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-libiconv/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiconv && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiconv-bootstrap
+
+
+.PHONY: all-stage4-libiconv maybe-all-stage4-libiconv
+.PHONY: clean-stage4-libiconv maybe-clean-stage4-libiconv
+maybe-all-stage4-libiconv:
+maybe-clean-stage4-libiconv:
+@if libiconv-bootstrap
+maybe-all-stage4-libiconv: all-stage4-libiconv
+all-stage4: all-stage4-libiconv
+TARGET-stage4-libiconv = $(TARGET-libiconv)
+all-stage4-libiconv: configure-stage4-libiconv
+       @[ $(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)/libiconv && \
+       $(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-libiconv)
+
+maybe-clean-stage4-libiconv: clean-stage4-libiconv
+clean-stage4: clean-stage4-libiconv
+clean-stage4-libiconv:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-libiconv/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiconv && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiconv-bootstrap
+
+
+.PHONY: all-stageprofile-libiconv maybe-all-stageprofile-libiconv
+.PHONY: clean-stageprofile-libiconv maybe-clean-stageprofile-libiconv
+maybe-all-stageprofile-libiconv:
+maybe-clean-stageprofile-libiconv:
+@if libiconv-bootstrap
+maybe-all-stageprofile-libiconv: all-stageprofile-libiconv
+all-stageprofile: all-stageprofile-libiconv
+TARGET-stageprofile-libiconv = $(TARGET-libiconv)
+all-stageprofile-libiconv: configure-stageprofile-libiconv
+       @[ $(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)/libiconv && \
+       $(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-libiconv)
+
+maybe-clean-stageprofile-libiconv: clean-stageprofile-libiconv
+clean-stageprofile: clean-stageprofile-libiconv
+clean-stageprofile-libiconv:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-libiconv/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiconv && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiconv-bootstrap
+
+
+.PHONY: all-stagefeedback-libiconv maybe-all-stagefeedback-libiconv
+.PHONY: clean-stagefeedback-libiconv maybe-clean-stagefeedback-libiconv
+maybe-all-stagefeedback-libiconv:
+maybe-clean-stagefeedback-libiconv:
+@if libiconv-bootstrap
+maybe-all-stagefeedback-libiconv: all-stagefeedback-libiconv
+all-stagefeedback: all-stagefeedback-libiconv
+TARGET-stagefeedback-libiconv = $(TARGET-libiconv)
+all-stagefeedback-libiconv: configure-stagefeedback-libiconv
+       @[ $(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)/libiconv && \
+       $(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-libiconv)
+
+maybe-clean-stagefeedback-libiconv: clean-stagefeedback-libiconv
+clean-stagefeedback: clean-stagefeedback-libiconv
+clean-stagefeedback-libiconv:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libiconv/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiconv && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiconv-bootstrap
+
+
+
+
  
  .PHONY: check-libiconv maybe-check-libiconv
  maybe-check-libiconv:
@@ -24998,9 +24658,9 @@ check-libiconv:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libiconv && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
  
  @endif libiconv
  
@@ -25029,24 +24689,8 @@ maybe-info-libiconv:
  @if libiconv
  maybe-info-libiconv: info-libiconv
  
-info-libiconv: \
-    configure-libiconv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
-         $(MAKE) $(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
+# libiconv doesn't support info.
+info-libiconv:
  
  @endif libiconv
  
@@ -25057,7 +24701,6 @@ maybe-dvi-libiconv: dvi-libiconv
  
  dvi-libiconv: \
      configure-libiconv 
-       @: $(MAKE); $(unstage)
         @[ -f ./libiconv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25065,7 +24708,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}" \
@@ -25081,24 +24724,8 @@ maybe-pdf-libiconv:
  @if libiconv
  maybe-pdf-libiconv: pdf-libiconv
  
-pdf-libiconv: \
-    configure-libiconv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
-         $(MAKE) $(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
+# libiconv doesn't support pdf.
+pdf-libiconv:
  
  @endif libiconv
  
@@ -25107,24 +24734,8 @@ maybe-html-libiconv:
  @if libiconv
  maybe-html-libiconv: html-libiconv
  
-html-libiconv: \
-    configure-libiconv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
-         $(MAKE) $(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
+# libiconv doesn't support html.
+html-libiconv:
  
  @endif libiconv
  
@@ -25135,7 +24746,6 @@ maybe-TAGS-libiconv: TAGS-libiconv
  
  TAGS-libiconv: \
      configure-libiconv 
-       @: $(MAKE); $(unstage)
         @[ -f ./libiconv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25143,7 +24753,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}" \
@@ -25191,7 +24801,6 @@ maybe-installcheck-libiconv: installcheck-libiconv
  
  installcheck-libiconv: \
      configure-libiconv 
-       @: $(MAKE); $(unstage)
         @[ -f ./libiconv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25199,7 +24808,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}" \
@@ -25216,7 +24825,6 @@ maybe-mostlyclean-libiconv:
  maybe-mostlyclean-libiconv: mostlyclean-libiconv
  
  mostlyclean-libiconv: 
-       @: $(MAKE); $(unstage)
         @[ -f ./libiconv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25224,7 +24832,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}" \
@@ -25241,7 +24849,6 @@ maybe-clean-libiconv:
  maybe-clean-libiconv: clean-libiconv
  
  clean-libiconv: 
-       @: $(MAKE); $(unstage)
         @[ -f ./libiconv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25249,7 +24856,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}" \
@@ -25266,7 +24873,6 @@ maybe-distclean-libiconv:
  maybe-distclean-libiconv: distclean-libiconv
  
  distclean-libiconv: 
-       @: $(MAKE); $(unstage)
         @[ -f ./libiconv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25274,7 +24880,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}" \
@@ -25291,7 +24897,6 @@ maybe-maintainer-clean-libiconv:
  maybe-maintainer-clean-libiconv: maintainer-clean-libiconv
  
  maintainer-clean-libiconv: 
-       @: $(MAKE); $(unstage)
         @[ -f ./libiconv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25299,7 +24904,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}" \
@@ -25324,7 +24929,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; \
@@ -25376,7 +24981,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)
  
@@ -25429,7 +25034,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}" \
@@ -25455,7 +25060,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}" \
@@ -25481,7 +25086,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}" \
@@ -25507,7 +25112,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}" \
@@ -25533,7 +25138,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}" \
@@ -25560,7 +25165,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}" \
@@ -25587,7 +25192,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}" \
@@ -25614,7 +25219,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}" \
@@ -25640,7 +25245,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}" \
@@ -25665,7 +25270,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}" \
@@ -25690,7 +25295,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}" \
@@ -25715,7 +25320,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}" \
@@ -25740,7 +25345,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}" \
@@ -25765,7 +25370,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; \
@@ -25817,7 +25422,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)
  
@@ -25870,7 +25475,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}" \
@@ -25896,7 +25501,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}" \
@@ -25922,7 +25527,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}" \
@@ -25948,7 +25553,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}" \
@@ -25974,7 +25579,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}" \
@@ -26001,7 +25606,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}" \
@@ -26028,7 +25633,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}" \
@@ -26055,7 +25660,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}" \
@@ -26081,7 +25686,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}" \
@@ -26106,7 +25711,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}" \
@@ -26131,7 +25736,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}" \
@@ -26156,7 +25761,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}" \
@@ -26181,7 +25786,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}" \
@@ -26206,7 +25811,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; \
@@ -26258,7 +25863,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)
  
@@ -26311,7 +25916,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}" \
@@ -26337,7 +25942,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}" \
@@ -26363,7 +25968,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}" \
@@ -26389,7 +25994,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}" \
@@ -26415,7 +26020,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}" \
@@ -26442,7 +26047,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}" \
@@ -26469,7 +26074,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}" \
@@ -26496,7 +26101,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}" \
@@ -26522,7 +26127,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}" \
@@ -26547,7 +26152,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}" \
@@ -26572,7 +26177,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}" \
@@ -26597,7 +26202,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}" \
@@ -26622,7 +26227,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}" \
@@ -26647,7 +26252,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; \
@@ -26699,7 +26304,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)
  
@@ -26752,7 +26357,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}" \
@@ -26778,7 +26383,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}" \
@@ -26804,7 +26409,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}" \
@@ -26830,7 +26435,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}" \
@@ -26856,7 +26461,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}" \
@@ -26883,7 +26488,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}" \
@@ -26910,7 +26515,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}" \
@@ -26937,7 +26542,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}" \
@@ -26963,7 +26568,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}" \
@@ -26988,7 +26593,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}" \
@@ -27013,7 +26618,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}" \
@@ -27038,7 +26643,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}" \
@@ -27063,7 +26668,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}" \
@@ -27088,7 +26693,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; \
@@ -27140,7 +26745,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)
  
@@ -27181,7 +26786,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}" \
@@ -27207,7 +26812,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}" \
@@ -27233,7 +26838,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}" \
@@ -27259,7 +26864,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}" \
@@ -27285,7 +26890,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}" \
@@ -27312,7 +26917,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}" \
@@ -27339,7 +26944,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}" \
@@ -27366,7 +26971,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}" \
@@ -27392,7 +26997,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}" \
@@ -27417,7 +27022,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}" \
@@ -27442,7 +27047,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}" \
@@ -27467,7 +27072,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}" \
@@ -27492,7 +27097,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}" \
@@ -27516,7 +27121,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; \
@@ -27530,7 +27135,7 @@ configure-zlib:
           $$s/$$module_srcdir/configure \
           --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias}  \
+         --target=${target_alias} @extra_host_zlib_configure_flags@ \
           || exit 1
  @endif zlib
  
@@ -27551,8 +27156,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) ;; \
@@ -27565,7 +27170,8 @@ configure-stage1-zlib:
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
           --target=${target_alias} \
            \
-         $(STAGE1_CONFIGURE_FLAGS)
+         $(STAGE1_CONFIGURE_FLAGS) \
+         @extra_host_zlib_configure_flags@
  @endif zlib-bootstrap
  
  .PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
@@ -27584,8 +27190,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) ;; \
@@ -27597,8 +27203,9 @@ configure-stage2-zlib:
           --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
           --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
-         $(STAGE2_CONFIGURE_FLAGS)
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS) \
+         @extra_host_zlib_configure_flags@
  @endif zlib-bootstrap
  
  .PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
@@ -27617,8 +27224,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) ;; \
@@ -27630,8 +27237,9 @@ configure-stage3-zlib:
           --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
           --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
-         $(STAGE3_CONFIGURE_FLAGS)
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS) \
+         @extra_host_zlib_configure_flags@
  @endif zlib-bootstrap
  
  .PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
@@ -27650,8 +27258,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) ;; \
@@ -27663,8 +27271,9 @@ configure-stage4-zlib:
           --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
           --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
-         $(STAGE4_CONFIGURE_FLAGS)
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS) \
+         @extra_host_zlib_configure_flags@
  @endif zlib-bootstrap
  
  .PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
@@ -27683,8 +27292,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) ;; \
@@ -27696,8 +27305,9 @@ configure-stageprofile-zlib:
           --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
           --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
-         $(STAGEprofile_CONFIGURE_FLAGS)
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         @extra_host_zlib_configure_flags@
  @endif zlib-bootstrap
  
  .PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
@@ -27716,8 +27326,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) ;; \
@@ -27729,8 +27339,9 @@ configure-stagefeedback-zlib:
           --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
           --target=${target_alias} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         @extra_host_zlib_configure_flags@
  @endif zlib-bootstrap
  
  
@@ -28049,7 +27660,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}" \
@@ -28074,7 +27685,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}" \
@@ -28099,7 +27710,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}" \
@@ -28124,7 +27735,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}" \
@@ -28149,7 +27760,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}" \
@@ -28175,7 +27786,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}" \
@@ -28201,7 +27812,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}" \
@@ -28227,7 +27838,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}" \
@@ -28252,7 +27863,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}" \
@@ -28276,7 +27887,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}" \
@@ -28300,7 +27911,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}" \
@@ -28324,7 +27935,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}" \
@@ -28348,7 +27959,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}" \
@@ -28373,7 +27984,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; \
@@ -28425,7 +28036,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)
  
@@ -28478,7 +28089,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}" \
@@ -28504,7 +28115,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}" \
@@ -28530,7 +28141,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}" \
@@ -28556,7 +28167,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}" \
@@ -28582,7 +28193,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}" \
@@ -28609,7 +28220,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}" \
@@ -28636,7 +28247,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}" \
@@ -28663,7 +28274,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}" \
@@ -28689,7 +28300,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}" \
@@ -28714,7 +28325,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}" \
@@ -28739,7 +28350,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}" \
@@ -28764,7 +28375,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}" \
@@ -28789,7 +28400,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}" \
@@ -28814,7 +28425,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; \
@@ -28866,7 +28477,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)
  
@@ -28919,7 +28530,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}" \
@@ -28945,7 +28556,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}" \
@@ -28971,7 +28582,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}" \
@@ -28997,7 +28608,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}" \
@@ -29023,7 +28634,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}" \
@@ -29050,7 +28661,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}" \
@@ -29077,7 +28688,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}" \
@@ -29104,7 +28715,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}" \
@@ -29130,7 +28741,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}" \
@@ -29155,7 +28766,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}" \
@@ -29180,7 +28791,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}" \
@@ -29205,7 +28816,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}" \
@@ -29230,7 +28841,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}" \
@@ -29255,7 +28866,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; \
@@ -29307,7 +28918,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)
  
@@ -29360,7 +28971,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}" \
@@ -29386,7 +28997,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}" \
@@ -29412,7 +29023,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}" \
@@ -29438,7 +29049,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}" \
@@ -29464,7 +29075,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}" \
@@ -29491,7 +29102,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}" \
@@ -29518,7 +29129,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}" \
@@ -29545,7 +29156,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}" \
@@ -29571,7 +29182,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}" \
@@ -29596,7 +29207,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}" \
@@ -29621,7 +29232,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}" \
@@ -29646,7 +29257,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}" \
@@ -29671,7 +29282,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}" \
@@ -29696,7 +29307,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; \
@@ -29748,7 +29359,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)
  
@@ -29801,7 +29412,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}" \
@@ -29827,7 +29438,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}" \
@@ -29853,7 +29464,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}" \
@@ -29879,7 +29490,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}" \
@@ -29905,7 +29516,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}" \
@@ -29932,7 +29543,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}" \
@@ -29959,7 +29570,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}" \
@@ -29986,7 +29597,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}" \
@@ -30012,7 +29623,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}" \
@@ -30037,7 +29648,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}" \
@@ -30062,7 +29673,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}" \
@@ -30087,7 +29698,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}" \
@@ -30112,7 +29723,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}" \
@@ -30137,7 +29748,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; \
@@ -30236,7 +29847,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}" \
@@ -30262,7 +29873,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}" \
@@ -30288,7 +29899,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}" \
@@ -30314,7 +29925,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}" \
@@ -30340,7 +29951,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}" \
@@ -30367,7 +29978,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}" \
@@ -30394,7 +30005,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}" \
@@ -30421,7 +30032,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}" \
@@ -30447,7 +30058,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}" \
@@ -30512,7 +30123,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; \
@@ -30611,7 +30222,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}" \
@@ -30637,7 +30248,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}" \
@@ -30663,7 +30274,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}" \
@@ -30689,7 +30300,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}" \
@@ -30715,7 +30326,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}" \
@@ -30742,7 +30353,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}" \
@@ -30769,7 +30380,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}" \
@@ -30796,7 +30407,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}" \
@@ -30822,7 +30433,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}" \
@@ -30847,7 +30458,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}" \
@@ -30872,7 +30483,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}" \
@@ -30897,7 +30508,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}" \
@@ -30922,7 +30533,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}" \
@@ -30947,7 +30558,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; \
@@ -30999,7 +30610,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)
  
@@ -31052,7 +30663,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}" \
@@ -31078,7 +30689,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}" \
@@ -31104,7 +30715,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}" \
@@ -31130,7 +30741,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}" \
@@ -31156,7 +30767,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}" \
@@ -31183,7 +30794,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}" \
@@ -31210,7 +30821,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}" \
@@ -31237,7 +30848,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}" \
@@ -31263,7 +30874,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}" \
@@ -31288,7 +30899,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}" \
@@ -31313,7 +30924,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}" \
@@ -31338,7 +30949,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}" \
@@ -31363,7 +30974,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}" \
@@ -31387,7 +30998,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; \
@@ -31422,8 +31033,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) ;; \
@@ -31456,8 +31067,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) ;; \
@@ -31469,7 +31080,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
@@ -31490,8 +31101,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) ;; \
@@ -31503,7 +31114,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
@@ -31524,8 +31135,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) ;; \
@@ -31537,7 +31148,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
@@ -31558,8 +31169,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) ;; \
@@ -31571,7 +31182,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
@@ -31592,8 +31203,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) ;; \
@@ -31605,7 +31216,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
@@ -31892,9 +31503,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
  
@@ -31944,7 +31555,7 @@ info-lto-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 lto-plugin" ; \
+       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}" \
@@ -31969,7 +31580,7 @@ dvi-lto-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 lto-plugin" ; \
+       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}" \
@@ -31994,7 +31605,7 @@ pdf-lto-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 lto-plugin" ; \
+       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}" \
@@ -32019,7 +31630,7 @@ html-lto-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 lto-plugin" ; \
+       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}" \
@@ -32044,7 +31655,7 @@ TAGS-lto-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 lto-plugin" ; \
+       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}" \
@@ -32070,7 +31681,7 @@ install-info-lto-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 lto-plugin" ; \
+       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}" \
@@ -32096,7 +31707,7 @@ install-pdf-lto-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 lto-plugin" ; \
+       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}" \
@@ -32122,7 +31733,7 @@ install-html-lto-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 lto-plugin" ; \
+       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}" \
@@ -32147,7 +31758,7 @@ installcheck-lto-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 lto-plugin" ; \
+       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}" \
@@ -32171,7 +31782,7 @@ mostlyclean-lto-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 lto-plugin" ; \
+       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}" \
@@ -32195,7 +31806,7 @@ clean-lto-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 lto-plugin" ; \
+       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}" \
@@ -32219,7 +31830,7 @@ distclean-lto-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 lto-plugin" ; \
+       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}" \
@@ -32243,7 +31854,7 @@ maintainer-clean-lto-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 lto-plugin" ; \
+       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}" \
@@ -32264,10 +31875,11 @@ configure-libcc1: stage_current
  @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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1; \
         $(HOST_EXPORTS)  \
         echo Configuring in $(HOST_SUBDIR)/libcc1; \
         cd "$(HOST_SUBDIR)/libcc1" || exit 1; \
@@ -32287,211 +31899,6 @@ configure-libcc1:
  
  
  
-.PHONY: configure-stage1-libcc1 maybe-configure-stage1-libcc1
-maybe-configure-stage1-libcc1:
-@if libcc1-bootstrap
-maybe-configure-stage1-libcc1: configure-stage1-libcc1
-configure-stage1-libcc1:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libcc1/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)/libcc1 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(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} \
-          \
-         $(STAGE1_CONFIGURE_FLAGS) \
-         --enable-shared
-@endif libcc1-bootstrap
-
-.PHONY: configure-stage2-libcc1 maybe-configure-stage2-libcc1
-maybe-configure-stage2-libcc1:
-@if libcc1-bootstrap
-maybe-configure-stage2-libcc1: configure-stage2-libcc1
-configure-stage2-libcc1:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libcc1/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)/libcc1 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(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} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
-         $(STAGE2_CONFIGURE_FLAGS) \
-         --enable-shared
-@endif libcc1-bootstrap
-
-.PHONY: configure-stage3-libcc1 maybe-configure-stage3-libcc1
-maybe-configure-stage3-libcc1:
-@if libcc1-bootstrap
-maybe-configure-stage3-libcc1: configure-stage3-libcc1
-configure-stage3-libcc1:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libcc1/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)/libcc1 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(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} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
-         $(STAGE3_CONFIGURE_FLAGS) \
-         --enable-shared
-@endif libcc1-bootstrap
-
-.PHONY: configure-stage4-libcc1 maybe-configure-stage4-libcc1
-maybe-configure-stage4-libcc1:
-@if libcc1-bootstrap
-maybe-configure-stage4-libcc1: configure-stage4-libcc1
-configure-stage4-libcc1:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libcc1/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)/libcc1 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(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} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
-         $(STAGE4_CONFIGURE_FLAGS) \
-         --enable-shared
-@endif libcc1-bootstrap
-
-.PHONY: configure-stageprofile-libcc1 maybe-configure-stageprofile-libcc1
-maybe-configure-stageprofile-libcc1:
-@if libcc1-bootstrap
-maybe-configure-stageprofile-libcc1: configure-stageprofile-libcc1
-configure-stageprofile-libcc1:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libcc1/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)/libcc1 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(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} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
-         $(STAGEprofile_CONFIGURE_FLAGS) \
-         --enable-shared
-@endif libcc1-bootstrap
-
-.PHONY: configure-stagefeedback-libcc1 maybe-configure-stagefeedback-libcc1
-maybe-configure-stagefeedback-libcc1:
-@if libcc1-bootstrap
-maybe-configure-stagefeedback-libcc1: configure-stagefeedback-libcc1
-configure-stagefeedback-libcc1:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libcc1/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)/libcc1 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(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} \
-          --with-build-libsubdir=$(HOST_SUBDIR)  \
-         $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --enable-shared
-@endif libcc1-bootstrap
-
-
-
  
  
  .PHONY: all-libcc1 maybe-all-libcc1
@@ -32503,6 +31910,7 @@ all-libcc1: stage_current
  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)  \
@@ -32513,670 +31921,1851 @@ all-libcc1: configure-libcc1
  
  
  
-.PHONY: all-stage1-libcc1 maybe-all-stage1-libcc1
-.PHONY: clean-stage1-libcc1 maybe-clean-stage1-libcc1
-maybe-all-stage1-libcc1:
-maybe-clean-stage1-libcc1:
-@if libcc1-bootstrap
-maybe-all-stage1-libcc1: all-stage1-libcc1
-all-stage1: all-stage1-libcc1
-TARGET-stage1-libcc1 = $(TARGET-libcc1)
-all-stage1-libcc1: configure-stage1-libcc1
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+
+.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; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcc1 && \
-       $(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-libcc1)
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-maybe-clean-stage1-libcc1: clean-stage1-libcc1
-clean-stage1: clean-stage1-libcc1
-clean-stage1-libcc1:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-libcc1/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libcc1 && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-       $(STAGE1_FLAGS_TO_PASS)  clean
-@endif libcc1-bootstrap
-
-
-.PHONY: all-stage2-libcc1 maybe-all-stage2-libcc1
-.PHONY: clean-stage2-libcc1 maybe-clean-stage2-libcc1
-maybe-all-stage2-libcc1:
-maybe-clean-stage2-libcc1:
-@if libcc1-bootstrap
-maybe-all-stage2-libcc1: all-stage2-libcc1
-all-stage2: all-stage2-libcc1
-TARGET-stage2-libcc1 = $(TARGET-libcc1)
-all-stage2-libcc1: configure-stage2-libcc1
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+@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; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
         $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcc1 && \
-       $(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-libcc1)
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-maybe-clean-stage2-libcc1: clean-stage2-libcc1
-clean-stage2: clean-stage2-libcc1
-clean-stage2-libcc1:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-libcc1/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libcc1 && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcc1-bootstrap
-
-
-.PHONY: all-stage3-libcc1 maybe-all-stage3-libcc1
-.PHONY: clean-stage3-libcc1 maybe-clean-stage3-libcc1
-maybe-all-stage3-libcc1:
-maybe-clean-stage3-libcc1:
-@if libcc1-bootstrap
-maybe-all-stage3-libcc1: all-stage3-libcc1
-all-stage3: all-stage3-libcc1
-TARGET-stage3-libcc1 = $(TARGET-libcc1)
-all-stage3-libcc1: configure-stage3-libcc1
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+@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; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
         $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcc1 && \
-       $(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-libcc1)
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
  
-maybe-clean-stage3-libcc1: clean-stage3-libcc1
-clean-stage3: clean-stage3-libcc1
-clean-stage3-libcc1:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage3-libcc1/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libcc1 && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcc1-bootstrap
-
-
-.PHONY: all-stage4-libcc1 maybe-all-stage4-libcc1
-.PHONY: clean-stage4-libcc1 maybe-clean-stage4-libcc1
-maybe-all-stage4-libcc1:
-maybe-clean-stage4-libcc1:
-@if libcc1-bootstrap
-maybe-all-stage4-libcc1: all-stage4-libcc1
-all-stage4: all-stage4-libcc1
-TARGET-stage4-libcc1 = $(TARGET-libcc1)
-all-stage4-libcc1: configure-stage4-libcc1
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
+@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; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
         $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcc1 && \
-       $(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-libcc1)
+       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
  
-maybe-clean-stage4-libcc1: clean-stage4-libcc1
-clean-stage4: clean-stage4-libcc1
-clean-stage4-libcc1:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-libcc1/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libcc1 && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcc1-bootstrap
-
-
-.PHONY: all-stageprofile-libcc1 maybe-all-stageprofile-libcc1
-.PHONY: clean-stageprofile-libcc1 maybe-clean-stageprofile-libcc1
-maybe-all-stageprofile-libcc1:
-maybe-clean-stageprofile-libcc1:
-@if libcc1-bootstrap
-maybe-all-stageprofile-libcc1: all-stageprofile-libcc1
-all-stageprofile: all-stageprofile-libcc1
-TARGET-stageprofile-libcc1 = $(TARGET-libcc1)
-all-stageprofile-libcc1: configure-stageprofile-libcc1
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
+@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; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
         $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcc1 && \
-       $(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-libcc1)
+       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
  
-maybe-clean-stageprofile-libcc1: clean-stageprofile-libcc1
-clean-stageprofile: clean-stageprofile-libcc1
-clean-stageprofile-libcc1:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-libcc1/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libcc1 && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcc1-bootstrap
-
-
-.PHONY: all-stagefeedback-libcc1 maybe-all-stagefeedback-libcc1
-.PHONY: clean-stagefeedback-libcc1 maybe-clean-stagefeedback-libcc1
-maybe-all-stagefeedback-libcc1:
-maybe-clean-stagefeedback-libcc1:
-@if libcc1-bootstrap
-maybe-all-stagefeedback-libcc1: all-stagefeedback-libcc1
-all-stagefeedback: all-stagefeedback-libcc1
-TARGET-stagefeedback-libcc1 = $(TARGET-libcc1)
-all-stagefeedback-libcc1: configure-stagefeedback-libcc1
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
+@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; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
         $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcc1 && \
-       $(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-libcc1)
-
-maybe-clean-stagefeedback-libcc1: clean-stagefeedback-libcc1
-clean-stagefeedback: clean-stagefeedback-libcc1
-clean-stagefeedback-libcc1:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-libcc1/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libcc1 && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcc1-bootstrap
+       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: check-libcc1 maybe-check-libcc1
-maybe-check-libcc1:
+.PHONY: maybe-TAGS-libcc1 TAGS-libcc1
+maybe-TAGS-libcc1:
  @if libcc1
-maybe-check-libcc1: check-libcc1
+maybe-TAGS-libcc1: TAGS-libcc1
  
-check-libcc1:
+TAGS-libcc1: \
+    configure-libcc1 
         @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
+       @[ -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) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(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: install-libcc1 maybe-install-libcc1
-maybe-install-libcc1:
+.PHONY: maybe-install-info-libcc1 install-info-libcc1
+maybe-install-info-libcc1:
  @if libcc1
-maybe-install-libcc1: install-libcc1
+maybe-install-info-libcc1: install-info-libcc1
  
-install-libcc1: installdirs
+install-info-libcc1: \
+    configure-libcc1 \
+    info-libcc1 
         @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
+       @[ -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) $(FLAGS_TO_PASS)  install)
+         $(MAKE) $(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: install-strip-libcc1 maybe-install-strip-libcc1
-maybe-install-strip-libcc1:
+.PHONY: maybe-install-pdf-libcc1 install-pdf-libcc1
+maybe-install-pdf-libcc1:
  @if libcc1
-maybe-install-strip-libcc1: install-strip-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
  
-install-strip-libcc1: installdirs
+.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)/libcc1 && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif libcc1
+@endif target-libstdc++-v3
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-libcc1 info-libcc1
-maybe-info-libcc1:
-@if libcc1
-maybe-info-libcc1: info-libcc1
+.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-libcc1: \
-    configure-libcc1 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
+@endif target-libstdc++-v3
  
-.PHONY: maybe-dvi-libcc1 dvi-libcc1
-maybe-dvi-libcc1:
-@if libcc1
-maybe-dvi-libcc1: dvi-libcc1
+.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-libcc1: \
-    configure-libcc1 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
+@endif target-libstdc++-v3
  
-.PHONY: maybe-pdf-libcc1 pdf-libcc1
-maybe-pdf-libcc1:
-@if libcc1
-maybe-pdf-libcc1: pdf-libcc1
+.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-libcc1: \
-    configure-libcc1 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
+@endif target-libstdc++-v3
  
-.PHONY: maybe-html-libcc1 html-libcc1
-maybe-html-libcc1:
-@if libcc1
-maybe-html-libcc1: html-libcc1
+.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-libcc1: \
-    configure-libcc1 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
+@endif target-libstdc++-v3
  
-.PHONY: maybe-TAGS-libcc1 TAGS-libcc1
-maybe-TAGS-libcc1:
-@if libcc1
-maybe-TAGS-libcc1: TAGS-libcc1
+.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-libcc1: \
-    configure-libcc1 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
+@endif target-libstdc++-v3
  
-.PHONY: maybe-install-info-libcc1 install-info-libcc1
-maybe-install-info-libcc1:
-@if libcc1
-maybe-install-info-libcc1: install-info-libcc1
+.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-libcc1: \
-    configure-libcc1 \
-    info-libcc1 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
+@endif target-libstdc++-v3
  
-.PHONY: maybe-install-pdf-libcc1 install-pdf-libcc1
-maybe-install-pdf-libcc1:
-@if libcc1
-maybe-install-pdf-libcc1: install-pdf-libcc1
+.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-libcc1: \
-    configure-libcc1 \
-    pdf-libcc1 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
+@endif target-libstdc++-v3
  
-.PHONY: maybe-install-html-libcc1 install-html-libcc1
-maybe-install-html-libcc1:
-@if libcc1
-maybe-install-html-libcc1: install-html-libcc1
+.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-libcc1: \
-    configure-libcc1 \
-    html-libcc1 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
+@endif target-libstdc++-v3
  
-.PHONY: maybe-installcheck-libcc1 installcheck-libcc1
-maybe-installcheck-libcc1:
-@if libcc1
-maybe-installcheck-libcc1: installcheck-libcc1
+.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-libcc1: \
-    configure-libcc1 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
+@endif target-libstdc++-v3
  
-.PHONY: maybe-mostlyclean-libcc1 mostlyclean-libcc1
-maybe-mostlyclean-libcc1:
-@if libcc1
-maybe-mostlyclean-libcc1: mostlyclean-libcc1
+.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-libcc1: 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
+@endif target-libstdc++-v3
  
-.PHONY: maybe-clean-libcc1 clean-libcc1
-maybe-clean-libcc1:
-@if libcc1
-maybe-clean-libcc1: clean-libcc1
+.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-libcc1: 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
+@endif target-libstdc++-v3
  
-.PHONY: maybe-distclean-libcc1 distclean-libcc1
-maybe-distclean-libcc1:
-@if libcc1
-maybe-distclean-libcc1: distclean-libcc1
+.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-libcc1: 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
+@endif target-libstdc++-v3
  
-.PHONY: maybe-maintainer-clean-libcc1 maintainer-clean-libcc1
-maybe-maintainer-clean-libcc1:
-@if libcc1
-maybe-maintainer-clean-libcc1: maintainer-clean-libcc1
+.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-libcc1: 
-       @[ -f ./libcc1/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) ; 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 libcc1" ; \
-       (cd $(HOST_SUBDIR)/libcc1 && \
+       (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 libcc1
-
-
+@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 \
@@ -33184,317 +33773,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)" \
@@ -33505,39 +34094,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)" \
@@ -33547,38 +34136,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)" \
@@ -33588,38 +34177,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)" \
@@ -33629,38 +34218,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)" \
@@ -33670,38 +34259,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)" \
@@ -33711,90 +34300,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}" \
@@ -33802,25 +34391,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}" \
@@ -33828,25 +34417,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}" \
@@ -33854,25 +34443,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}" \
@@ -33880,25 +34469,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}" \
@@ -33906,26 +34495,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}" \
@@ -33933,26 +34522,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}" \
@@ -33960,26 +34549,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}" \
@@ -33987,25 +34576,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}" \
@@ -34013,24 +34602,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}" \
@@ -34038,24 +34627,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}" \
@@ -34063,24 +34652,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}" \
@@ -34088,24 +34677,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}" \
@@ -34113,46 +34702,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 \
@@ -34160,317 +34749,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)" \
@@ -34478,42 +35067,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)" \
@@ -34521,40 +35110,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)" \
@@ -34562,40 +35151,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)" \
@@ -34603,40 +35192,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)" \
@@ -34644,40 +35233,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)" \
@@ -34685,92 +35274,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}" \
@@ -34778,25 +35367,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}" \
@@ -34804,25 +35393,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}" \
@@ -34830,25 +35419,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}" \
@@ -34856,25 +35445,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}" \
@@ -34882,26 +35471,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}" \
@@ -34909,26 +35498,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}" \
@@ -34936,26 +35525,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}" \
@@ -34963,25 +35552,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}" \
@@ -34989,24 +35578,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}" \
@@ -35014,24 +35603,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}" \
@@ -35039,24 +35628,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}" \
@@ -35064,24 +35653,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}" \
@@ -35089,7 +35678,7 @@ maintainer-clean-target-libsanitizer:
                    maintainer-clean) \
           || exit 1
  
-@endif target-libsanitizer
+@endif target-libmpx
  
  
  
@@ -35106,8 +35695,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; \
@@ -35119,7 +35708,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; \
@@ -35151,7 +35740,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; \
@@ -35167,8 +35756,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) ;; \
@@ -35195,7 +35784,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; \
@@ -35212,8 +35801,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) ;; \
@@ -35225,7 +35814,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
  
@@ -35240,7 +35829,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; \
@@ -35257,8 +35846,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) ;; \
@@ -35270,7 +35859,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
  
@@ -35285,7 +35874,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; \
@@ -35302,8 +35891,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) ;; \
@@ -35315,7 +35904,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
  
@@ -35330,7 +35919,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; \
@@ -35347,8 +35936,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) ;; \
@@ -35360,7 +35949,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
  
@@ -35375,7 +35964,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; \
@@ -35392,8 +35981,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) ;; \
@@ -35405,7 +35994,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
  
@@ -35738,11 +36327,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; \
@@ -35764,11 +36353,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; \
@@ -35790,11 +36379,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; \
@@ -35816,11 +36405,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; \
@@ -35842,11 +36431,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; \
@@ -35869,11 +36458,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; \
@@ -35896,11 +36485,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; \
@@ -35923,11 +36512,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; \
@@ -35949,11 +36538,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; \
@@ -35974,11 +36563,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; \
@@ -35999,11 +36588,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; \
@@ -36024,11 +36613,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; \
@@ -36049,11 +36638,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; \
@@ -36083,8 +36672,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; \
@@ -36096,7 +36685,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; \
@@ -36196,11 +36785,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; \
@@ -36222,11 +36811,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; \
@@ -36248,11 +36837,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; \
@@ -36274,11 +36863,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; \
@@ -36300,11 +36889,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; \
@@ -36327,11 +36916,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; \
@@ -36354,11 +36943,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; \
@@ -36381,11 +36970,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; \
@@ -36407,11 +36996,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; \
@@ -36432,11 +37021,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; \
@@ -36457,11 +37046,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; \
@@ -36482,11 +37071,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; \
@@ -36507,11 +37096,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; \
@@ -36529,6 +37118,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
@@ -36541,8 +37588,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; \
@@ -36554,7 +37601,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; \
@@ -36654,11 +37701,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; \
@@ -36680,11 +37727,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; \
@@ -36706,11 +37753,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; \
@@ -36732,11 +37779,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; \
@@ -36758,11 +37805,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; \
@@ -36785,11 +37832,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; \
@@ -36812,11 +37859,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; \
@@ -36839,11 +37886,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; \
@@ -36865,11 +37912,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; \
@@ -36890,11 +37937,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; \
@@ -36915,11 +37962,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; \
@@ -36940,11 +37987,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; \
@@ -36965,11 +38012,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; \
@@ -36999,8 +38046,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; \
@@ -37012,7 +38059,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; \
@@ -37112,11 +38159,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; \
@@ -37138,11 +38185,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; \
@@ -37164,11 +38211,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; \
@@ -37190,11 +38237,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; \
@@ -37216,11 +38263,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; \
@@ -37243,11 +38290,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; \
@@ -37270,11 +38317,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; \
@@ -37297,11 +38344,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; \
@@ -37323,11 +38370,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; \
@@ -37348,11 +38395,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; \
@@ -37373,11 +38420,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; \
@@ -37398,11 +38445,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; \
@@ -37423,11 +38470,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; \
@@ -37456,8 +38503,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; \
@@ -37469,7 +38516,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; \
@@ -37501,7 +38548,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; \
@@ -37517,8 +38564,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) ;; \
@@ -37545,7 +38592,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; \
@@ -37562,8 +38609,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) ;; \
@@ -37575,7 +38622,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
  
@@ -37590,7 +38637,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; \
@@ -37607,8 +38654,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) ;; \
@@ -37620,7 +38667,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
  
@@ -37635,7 +38682,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; \
@@ -37652,8 +38699,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) ;; \
@@ -37665,7 +38712,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
  
@@ -37680,7 +38727,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; \
@@ -37697,8 +38744,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) ;; \
@@ -37710,7 +38757,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
  
@@ -37725,7 +38772,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; \
@@ -37742,8 +38789,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) ;; \
@@ -37755,7 +38802,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
  
@@ -38083,11 +39130,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; \
@@ -38109,11 +39156,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; \
@@ -38135,11 +39182,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; \
@@ -38161,11 +39208,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; \
@@ -38187,11 +39234,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; \
@@ -38214,11 +39261,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; \
@@ -38241,11 +39288,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; \
@@ -38268,11 +39315,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; \
@@ -38294,11 +39341,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; \
@@ -38319,11 +39366,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; \
@@ -38344,11 +39391,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; \
@@ -38369,11 +39416,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; \
@@ -38394,11 +39441,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; \
@@ -38428,8 +39475,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; \
@@ -38441,7 +39488,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; \
@@ -38541,11 +39588,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; \
@@ -38567,11 +39614,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; \
@@ -38593,11 +39640,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; \
@@ -38619,11 +39666,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; \
@@ -38645,11 +39692,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; \
@@ -38672,11 +39719,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; \
@@ -38699,11 +39746,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; \
@@ -38726,11 +39773,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; \
@@ -38752,11 +39799,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; \
@@ -38777,11 +39824,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; \
@@ -38802,11 +39849,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; \
@@ -38827,11 +39874,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; \
@@ -38852,11 +39899,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; \
@@ -38886,8 +39933,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; \
@@ -38899,7 +39946,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; \
@@ -38999,11 +40046,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; \
@@ -39025,11 +40072,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; \
@@ -39051,11 +40098,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; \
@@ -39077,11 +40124,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; \
@@ -39103,11 +40150,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; \
@@ -39130,11 +40177,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; \
@@ -39157,11 +40204,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; \
@@ -39184,11 +40231,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; \
@@ -39210,11 +40257,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; \
@@ -39235,11 +40282,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; \
@@ -39260,11 +40307,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; \
@@ -39285,11 +40332,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; \
@@ -39310,11 +40357,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; \
@@ -39344,8 +40391,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; \
@@ -39357,7 +40404,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; \
@@ -39457,11 +40504,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; \
@@ -39483,11 +40530,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; \
@@ -39509,11 +40556,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; \
@@ -39535,11 +40582,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; \
@@ -39561,11 +40608,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; \
@@ -39588,11 +40635,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; \
@@ -39615,11 +40662,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; \
@@ -39642,11 +40689,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; \
@@ -39668,11 +40715,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; \
@@ -39693,11 +40740,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; \
@@ -39718,11 +40765,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; \
@@ -39743,11 +40790,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; \
@@ -39768,11 +40815,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; \
@@ -39802,8 +40849,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; \
@@ -39815,7 +40862,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; \
@@ -39915,11 +40962,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; \
@@ -39941,11 +40988,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; \
@@ -39967,11 +41014,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; \
@@ -39993,11 +41040,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; \
@@ -40019,11 +41066,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; \
@@ -40046,11 +41093,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; \
@@ -40073,11 +41120,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; \
@@ -40100,11 +41147,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; \
@@ -40126,11 +41173,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; \
@@ -40151,11 +41198,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; \
@@ -40176,11 +41223,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; \
@@ -40201,11 +41248,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; \
@@ -40226,11 +41273,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; \
@@ -40260,8 +41307,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; \
@@ -40273,7 +41320,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; \
@@ -40373,11 +41420,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; \
@@ -40399,11 +41446,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; \
@@ -40425,11 +41472,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; \
@@ -40451,11 +41498,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; \
@@ -40477,11 +41524,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; \
@@ -40504,11 +41551,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; \
@@ -40531,11 +41578,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; \
@@ -40558,11 +41605,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; \
@@ -40584,11 +41631,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; \
@@ -40609,11 +41656,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; \
@@ -40634,11 +41681,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; \
@@ -40659,11 +41706,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; \
@@ -40684,11 +41731,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; \
@@ -40718,8 +41765,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; \
@@ -40731,7 +41778,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; \
@@ -40826,11 +41873,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; \
@@ -40852,11 +41899,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; \
@@ -40878,11 +41925,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; \
@@ -40904,11 +41951,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; \
@@ -40930,11 +41977,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; \
@@ -40957,11 +42004,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; \
@@ -40984,11 +42031,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; \
@@ -41011,11 +42058,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; \
@@ -41037,11 +42084,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; \
@@ -41111,8 +42158,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; \
@@ -41124,7 +42171,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; \
@@ -41224,11 +42271,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; \
@@ -41250,11 +42297,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; \
@@ -41276,11 +42323,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; \
@@ -41302,11 +42349,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; \
@@ -41328,11 +42375,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; \
@@ -41355,11 +42402,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; \
@@ -41382,11 +42429,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; \
@@ -41409,11 +42456,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; \
@@ -41435,11 +42482,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; \
@@ -41460,11 +42507,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; \
@@ -41485,11 +42532,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; \
@@ -41510,11 +42557,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; \
@@ -41535,11 +42582,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; \
@@ -41569,8 +42616,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; \
@@ -41582,7 +42629,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; \
@@ -41677,11 +42724,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; \
@@ -41703,11 +42750,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; \
@@ -41729,11 +42776,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; \
@@ -41755,11 +42802,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; \
@@ -41781,11 +42828,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; \
@@ -41808,11 +42855,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; \
@@ -41835,11 +42882,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; \
@@ -41862,11 +42909,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; \
@@ -41888,11 +42935,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; \
@@ -41913,11 +42960,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; \
@@ -41938,11 +42985,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; \
@@ -41963,11 +43010,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; \
@@ -41988,11 +43035,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; \
@@ -42022,8 +43069,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; \
@@ -42035,7 +43082,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; \
@@ -42125,11 +43172,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; \
@@ -42151,11 +43198,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; \
@@ -42177,11 +43224,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; \
@@ -42203,11 +43250,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; \
@@ -42229,11 +43276,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; \
@@ -42256,11 +43303,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; \
@@ -42283,11 +43330,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; \
@@ -42310,11 +43357,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; \
@@ -42336,11 +43383,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; \
@@ -42361,11 +43408,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; \
@@ -42386,11 +43433,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; \
@@ -42411,11 +43458,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; \
@@ -42436,11 +43483,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; \
@@ -42470,8 +43517,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; \
@@ -42483,7 +43530,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; \
@@ -42583,11 +43630,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; \
@@ -42609,11 +43656,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; \
@@ -42635,11 +43682,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; \
@@ -42661,11 +43708,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; \
@@ -42687,11 +43734,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; \
@@ -42714,11 +43761,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; \
@@ -42741,11 +43788,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; \
@@ -42768,11 +43815,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; \
@@ -42794,11 +43841,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; \
@@ -42819,11 +43866,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; \
@@ -42844,11 +43891,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; \
@@ -42869,11 +43916,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; \
@@ -42894,11 +43941,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; \
@@ -42928,8 +43975,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; \
@@ -42941,7 +43988,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; \
@@ -43041,11 +44088,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; \
@@ -43067,11 +44114,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; \
@@ -43093,11 +44140,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; \
@@ -43119,11 +44166,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; \
@@ -43145,11 +44192,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; \
@@ -43172,11 +44219,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; \
@@ -43199,11 +44246,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; \
@@ -43226,11 +44273,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; \
@@ -43252,11 +44299,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; \
@@ -43277,11 +44324,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; \
@@ -43302,11 +44349,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; \
@@ -43327,11 +44374,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; \
@@ -43352,11 +44399,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; \
@@ -43386,8 +44433,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; \
@@ -43399,7 +44446,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; \
@@ -43499,11 +44546,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; \
@@ -43525,11 +44572,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; \
@@ -43551,11 +44598,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; \
@@ -43577,11 +44624,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; \
@@ -43603,11 +44650,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; \
@@ -43630,11 +44677,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; \
@@ -43657,11 +44704,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; \
@@ -43684,11 +44731,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; \
@@ -43710,11 +44757,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; \
@@ -43735,11 +44782,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; \
@@ -43760,11 +44807,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; \
@@ -43785,11 +44832,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; \
@@ -43810,11 +44857,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; \
@@ -43844,8 +44891,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; \
@@ -43857,7 +44904,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; \
@@ -43957,11 +45004,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; \
@@ -43983,11 +45030,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; \
@@ -44009,11 +45056,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; \
@@ -44035,11 +45082,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; \
@@ -44061,11 +45108,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; \
@@ -44088,11 +45135,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; \
@@ -44115,11 +45162,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; \
@@ -44142,11 +45189,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; \
@@ -44168,11 +45215,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; \
@@ -44193,11 +45240,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; \
@@ -44218,11 +45265,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; \
@@ -44243,11 +45290,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; \
@@ -44268,11 +45315,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; \
@@ -44302,8 +45349,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; \
@@ -44315,7 +45362,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; \
@@ -44415,11 +45462,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; \
@@ -44441,11 +45488,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; \
@@ -44467,11 +45514,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; \
@@ -44493,11 +45540,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; \
@@ -44519,11 +45566,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; \
@@ -44546,11 +45593,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; \
@@ -44573,11 +45620,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; \
@@ -44600,11 +45647,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; \
@@ -44626,11 +45673,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; \
@@ -44651,11 +45698,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; \
@@ -44676,11 +45723,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; \
@@ -44701,11 +45748,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; \
@@ -44726,11 +45773,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; \
@@ -44759,8 +45806,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; \
@@ -44772,7 +45819,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; \
@@ -44804,7 +45851,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; \
@@ -44820,8 +45867,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) ;; \
@@ -44848,7 +45895,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; \
@@ -44865,8 +45912,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) ;; \
@@ -44878,7 +45925,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
  
@@ -44893,7 +45940,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; \
@@ -44910,8 +45957,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) ;; \
@@ -44923,7 +45970,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
  
@@ -44938,7 +45985,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; \
@@ -44955,8 +46002,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) ;; \
@@ -44968,7 +46015,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
  
@@ -44983,7 +46030,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; \
@@ -45000,8 +46047,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) ;; \
@@ -45013,7 +46060,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
  
@@ -45028,7 +46075,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; \
@@ -45045,8 +46092,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) ;; \
@@ -45058,7 +46105,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
  
@@ -45391,11 +46438,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; \
@@ -45417,11 +46464,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; \
@@ -45443,11 +46490,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; \
@@ -45469,11 +46516,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; \
@@ -45495,11 +46542,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; \
@@ -45522,11 +46569,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; \
@@ -45549,11 +46596,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; \
@@ -45576,11 +46623,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; \
@@ -45602,11 +46649,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; \
@@ -45627,11 +46674,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; \
@@ -45652,11 +46699,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; \
@@ -45677,11 +46724,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; \
@@ -45702,11 +46749,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; \
@@ -45736,8 +46783,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; \
@@ -45749,7 +46796,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; \
@@ -45849,11 +46896,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; \
@@ -45875,11 +46922,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; \
@@ -45901,11 +46948,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; \
@@ -45927,11 +46974,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; \
@@ -45953,11 +47000,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; \
@@ -45980,11 +47027,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; \
@@ -46007,11 +47054,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; \
@@ -46034,11 +47081,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; \
@@ -46060,11 +47107,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; \
@@ -46085,11 +47132,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; \
@@ -46110,11 +47157,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; \
@@ -46135,11 +47182,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; \
@@ -46160,11 +47207,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; \
@@ -46194,8 +47241,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; \
@@ -46207,7 +47254,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; \
@@ -46307,11 +47354,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; \
@@ -46333,11 +47380,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; \
@@ -46359,11 +47406,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; \
@@ -46385,11 +47432,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; \
@@ -46411,11 +47458,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; \
@@ -46438,11 +47485,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; \
@@ -46465,11 +47512,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; \
@@ -46492,11 +47539,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; \
@@ -46518,11 +47565,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; \
@@ -46543,11 +47590,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; \
@@ -46568,11 +47615,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; \
@@ -46593,11 +47640,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; \
@@ -46618,11 +47665,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; \
@@ -46665,7 +47712,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
@@ -46805,577 +47852,555 @@ 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 libiconv
+       @cd $(HOST_SUBDIR); [ -d stage1-libiconv ] || \
+         mkdir stage1-libiconv; \
+       mv stage1-libiconv libiconv
+@endif libiconv
  @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
-@if libcc1
-       @cd $(HOST_SUBDIR); [ -d stage1-libcc1 ] || \
-         mkdir stage1-libcc1; \
-       mv stage1-libcc1 libcc1 
-@endif libcc1
         @[ -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  ; \
-       fi
-@endif libelf
-@if 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  ; \
-       fi
-@endif intl
-@if 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  ; \
-       fi
-@endif libbacktrace
-@if 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  ; \
-       fi
-@endif libdecnumber
-@if 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  ; \
-       fi
-@endif libiberty-linker-plugin
-@if 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  ; \
-       fi
-@endif lto-plugin
-@if libcc1
-       @if test -d $(HOST_SUBDIR)/libcc1 ; then \
-         cd $(HOST_SUBDIR); mv libcc1 stage1-libcc1  ; \
-       fi
-@endif libcc1
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR)  ; \
-       fi
-       rm -f stage_current
-
-# Bubble a bug fix through all the stages up to stage 1.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured either.
-.PHONY: stage1-bubble
-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 ; \
-       else \
-         $(MAKE) stage1-start; \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
-       fi
-
-.PHONY: all-stage1 clean-stage1
-do-clean: clean-stage1
-
-# 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
-
-
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-
-.PHONY: distclean-stage1
-distclean-stage1::
-       @: $(MAKE); $(stage)
-       @test "`cat stage_last`" != stage1 || rm -f stage_last
-       rm -rf stage1-* 
-
-
-@endif gcc-bootstrap
-
-
-.PHONY: stage2-start stage2-end
-
-stage2-start::
-       @: $(MAKE); $(stage); \
-       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 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 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 stage1-binutils prev-binutils || test -f stage1-lean 
-@endif binutils
-@if fixincludes
-       @cd $(HOST_SUBDIR); [ -d stage2-fixincludes ] || \
-         mkdir stage2-fixincludes; \
-       mv stage2-fixincludes fixincludes  ; \
-       mv stage1-fixincludes prev-fixincludes || test -f stage1-lean 
-@endif fixincludes
-@if gas
-       @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
-         mkdir stage2-gas; \
-       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 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 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 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 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 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 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 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 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 stage1-ld prev-ld || test -f stage1-lean 
-@endif ld
-@if libbacktrace
-       @cd $(HOST_SUBDIR); [ -d stage2-libbacktrace ] || \
-         mkdir stage2-libbacktrace; \
-       mv stage2-libbacktrace libbacktrace  ; \
-       mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
-@endif libbacktrace
-@if libcpp
-       @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
-         mkdir stage2-libcpp; \
-       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 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 stage1-libiberty prev-libiberty || test -f stage1-lean 
-@endif libiberty
-@if libiberty-linker-plugin
-       @cd $(HOST_SUBDIR); [ -d stage2-libiberty-linker-plugin ] || \
-         mkdir stage2-libiberty-linker-plugin; \
-       mv stage2-libiberty-linker-plugin libiberty-linker-plugin  ; \
-       mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean 
-@endif libiberty-linker-plugin
-@if zlib
-       @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
-         mkdir stage2-zlib; \
-       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 stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
-@endif lto-plugin
-@if libcc1
-       @cd $(HOST_SUBDIR); [ -d stage2-libcc1 ] || \
-         mkdir stage2-libcc1; \
-       mv stage2-libcc1 libcc1  ; \
-       mv stage1-libcc1 prev-libcc1 || test -f stage1-lean 
-@endif libcc1
-       @[ -d stage2-$(TARGET_SUBDIR) ] || \
-         mkdir stage2-$(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 ; :  ; \
-       fi
-@endif bfd
-@if 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 ; :  ; \
-       fi
-@endif binutils
-@if fixincludes
-       @if test -d $(HOST_SUBDIR)/fixincludes ; then \
-         cd $(HOST_SUBDIR); mv fixincludes stage2-fixincludes ; \
-         mv prev-fixincludes stage1-fixincludes ; :  ; \
-       fi
-@endif fixincludes
-@if gas
-       @if test -d $(HOST_SUBDIR)/gas ; then \
-         cd $(HOST_SUBDIR); mv gas stage2-gas ; \
-         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 ; :  ; \
-       fi
-@endif gcc
-@if 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 ; :  ; \
-       fi
-@endif mpfr
-@if 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 ; :  ; \
-       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 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 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 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 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 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 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 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 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 stage1-libiberty-linker-plugin; \
         fi
  @endif libiberty-linker-plugin
+@if libiconv
+       @if test -d $(HOST_SUBDIR)/libiconv; then \
+         cd $(HOST_SUBDIR); mv libiconv stage1-libiconv; \
+       fi
+@endif libiconv
  @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 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 stage1-lto-plugin; \
         fi
  @endif lto-plugin
-@if libcc1
-       @if test -d $(HOST_SUBDIR)/libcc1 ; then \
-         cd $(HOST_SUBDIR); mv libcc1 stage2-libcc1 ; \
-         mv prev-libcc1 stage1-libcc1 ; :  ; \
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); \
         fi
-@endif libcc1
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
+       rm -f stage_current
+
+# Bubble a bug fix through all the stages up to stage 1.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured either.
+.PHONY: stage1-bubble
+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; \
+       else \
+         $(MAKE) stage1-start; \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
+       fi
+
+.PHONY: all-stage1 clean-stage1
+do-clean: clean-stage1
+
+# 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
+
+
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+
+.PHONY: distclean-stage1
+distclean-stage1::
+       @: $(MAKE); $(stage)
+       @test "`cat stage_last`" != stage1 || rm -f stage_last
+       rm -rf stage1-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage2-start stage2-end
+
+stage2-start::
+       @: $(MAKE); $(stage); \
+       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 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 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 stage1-binutils prev-binutils || test -f stage1-lean 
+@endif binutils
+@if fixincludes
+       @cd $(HOST_SUBDIR); [ -d stage2-fixincludes ] || \
+         mkdir stage2-fixincludes; \
+       mv stage2-fixincludes fixincludes; \
+       mv stage1-fixincludes prev-fixincludes || test -f stage1-lean 
+@endif fixincludes
+@if gas
+       @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
+         mkdir stage2-gas; \
+       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 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 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 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 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 stage1-isl prev-isl || test -f stage1-lean 
+@endif isl
+@if libelf
+       @cd $(HOST_SUBDIR); [ -d stage2-libelf ] || \
+         mkdir stage2-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 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 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 stage1-ld prev-ld || test -f stage1-lean 
+@endif ld
+@if libbacktrace
+       @cd $(HOST_SUBDIR); [ -d stage2-libbacktrace ] || \
+         mkdir stage2-libbacktrace; \
+       mv stage2-libbacktrace libbacktrace; \
+       mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
+@endif libbacktrace
+@if libcpp
+       @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
+         mkdir stage2-libcpp; \
+       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 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 stage1-libiberty prev-libiberty || test -f stage1-lean 
+@endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stage2-libiberty-linker-plugin ] || \
+         mkdir stage2-libiberty-linker-plugin; \
+       mv stage2-libiberty-linker-plugin libiberty-linker-plugin; \
+       mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean 
+@endif libiberty-linker-plugin
+@if libiconv
+       @cd $(HOST_SUBDIR); [ -d stage2-libiconv ] || \
+         mkdir stage2-libiconv; \
+       mv stage2-libiconv libiconv; \
+       mv stage1-libiconv prev-libiconv || test -f stage1-lean 
+@endif libiconv
+@if zlib
+       @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
+         mkdir stage2-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 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 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; : ; \
+       fi
+@endif bfd
+@if 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; : ; \
+       fi
+@endif binutils
+@if fixincludes
+       @if test -d $(HOST_SUBDIR)/fixincludes; then \
+         cd $(HOST_SUBDIR); mv fixincludes stage2-fixincludes; \
+         mv prev-fixincludes stage1-fixincludes; : ; \
+       fi
+@endif fixincludes
+@if gas
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stage2-gas; \
+         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; : ; \
+       fi
+@endif gcc
+@if 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; : ; \
+       fi
+@endif mpfr
+@if 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; : ; \
+       fi
+@endif isl
+@if 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; : ; \
+       fi
+@endif gold
+@if 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; : ; \
+       fi
+@endif ld
+@if libbacktrace
+       @if test -d $(HOST_SUBDIR)/libbacktrace; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stage2-libbacktrace; \
+         mv prev-libbacktrace stage1-libbacktrace; : ; \
+       fi
+@endif libbacktrace
+@if libcpp
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stage2-libcpp; \
+         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; : ; \
+       fi
+@endif libdecnumber
+@if 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; : ; \
+       fi
+@endif libiberty-linker-plugin
+@if libiconv
+       @if test -d $(HOST_SUBDIR)/libiconv; then \
+         cd $(HOST_SUBDIR); mv libiconv stage2-libiconv; \
+         mv prev-libiconv stage1-libiconv; : ; \
+       fi
+@endif libiconv
+@if 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; : ; \
+       fi
+@endif lto-plugin
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \
         fi
         rm -f stage_current
  
@@ -47386,8 +48411,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; \
@@ -47442,294 +48467,282 @@ 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 libiconv
+       @cd $(HOST_SUBDIR); [ -d stage3-libiconv ] || \
+         mkdir stage3-libiconv; \
+       mv stage3-libiconv libiconv; \
+       mv stage2-libiconv prev-libiconv || test -f stage2-lean 
+@endif libiconv
  @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
-@if libcc1
-       @cd $(HOST_SUBDIR); [ -d stage3-libcc1 ] || \
-         mkdir stage3-libcc1; \
-       mv stage3-libcc1 libcc1  ; \
-       mv stage2-libcc1 prev-libcc1 || test -f stage2-lean 
-@endif libcc1
         @[ -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 libiconv
+       @if test -d $(HOST_SUBDIR)/libiconv; then \
+         cd $(HOST_SUBDIR); mv libiconv stage3-libiconv; \
+         mv prev-libiconv stage2-libiconv; : ; \
+       fi
+@endif libiconv
  @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 libcc1
-       @if test -d $(HOST_SUBDIR)/libcc1 ; then \
-         cd $(HOST_SUBDIR); mv libcc1 stage3-libcc1 ; \
-         mv prev-libcc1 stage2-libcc1 ; :  ; \
-       fi
-@endif libcc1
-       @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
  
@@ -47740,13 +48753,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
@@ -47763,16 +48776,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; \
@@ -47782,16 +48795,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-*; \
@@ -47852,294 +48865,282 @@ 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 libiconv
+       @cd $(HOST_SUBDIR); [ -d stage4-libiconv ] || \
+         mkdir stage4-libiconv; \
+       mv stage4-libiconv libiconv; \
+       mv stage3-libiconv prev-libiconv || test -f stage3-lean 
+@endif libiconv
  @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
-@if libcc1
-       @cd $(HOST_SUBDIR); [ -d stage4-libcc1 ] || \
-         mkdir stage4-libcc1; \
-       mv stage4-libcc1 libcc1  ; \
-       mv stage3-libcc1 prev-libcc1 || test -f stage3-lean 
-@endif libcc1
         @[ -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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 libiconv
+       @if test -d $(HOST_SUBDIR)/libiconv; then \
+         cd $(HOST_SUBDIR); mv libiconv stage4-libiconv; \
+         mv prev-libiconv stage3-libiconv; : ; \
+       fi
+@endif libiconv
  @if zlib
-       @if test -d $(HOST_SUBDIR)/zlib ; then \
-         cd $(HOST_SUBDIR); mv zlib stage4-zlib ; \
-         mv prev-zlib stage3-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 ; :  ; \
+       @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 libcc1
-       @if test -d $(HOST_SUBDIR)/libcc1 ; then \
-         cd $(HOST_SUBDIR); mv libcc1 stage4-libcc1 ; \
-         mv prev-libcc1 stage3-libcc1 ; :  ; \
-       fi
-@endif libcc1
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; :  ; \
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR); : ; \
         fi
         rm -f stage_current
  
@@ -48150,13 +49151,13 @@ stage4-end::
  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 ; \
+       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 ; \
+           rm -rf stage2-*; \
+           $(STAMP) stage2-lean; \
           fi; \
           $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
         fi
@@ -48173,16 +49174,16 @@ 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 ; \
+         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 ; \
+       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 \
+                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; \
@@ -48192,16 +49193,16 @@ compare3:
                 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) compare3
         if $(LEAN); then \
           rm -rf stage3-*; \
@@ -48250,294 +49251,282 @@ distclean-stage4::
  
  stageprofile-start::
         @: $(MAKE); $(stage); \
-       echo stageprofile > stage_current ; \
+       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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 libiconv
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libiconv ] || \
+         mkdir stageprofile-libiconv; \
+       mv stageprofile-libiconv libiconv; \
+       mv stage1-libiconv prev-libiconv || test -f stage1-lean 
+@endif libiconv
  @if zlib
         @cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \
           mkdir stageprofile-zlib; \
-       mv stageprofile-zlib 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 stageprofile-lto-plugin lto-plugin; \
         mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
  @endif lto-plugin
-@if libcc1
-       @cd $(HOST_SUBDIR); [ -d stageprofile-libcc1 ] || \
-         mkdir stageprofile-libcc1; \
-       mv stageprofile-libcc1 libcc1  ; \
-       mv stage1-libcc1 prev-libcc1 || test -f stage1-lean 
-@endif libcc1
         @[ -d stageprofile-$(TARGET_SUBDIR) ] || \
           mkdir stageprofile-$(TARGET_SUBDIR); \
-       mv stageprofile-$(TARGET_SUBDIR) $(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 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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stageprofile-gcc; \
+         mv prev-gcc stage1-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 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 ; :  ; \
+       @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 ; :  ; \
+       @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 ; :  ; \
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stageprofile-isl; \
+         mv prev-isl stage1-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 ; :  ; \
-       fi
-@endif cloog
  @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 libiconv
+       @if test -d $(HOST_SUBDIR)/libiconv; then \
+         cd $(HOST_SUBDIR); mv libiconv stageprofile-libiconv; \
+         mv prev-libiconv stage1-libiconv; : ; \
+       fi
+@endif libiconv
  @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 libcc1
-       @if test -d $(HOST_SUBDIR)/libcc1 ; then \
-         cd $(HOST_SUBDIR); mv libcc1 stageprofile-libcc1 ; \
-         mv prev-libcc1 stage1-libcc1 ; :  ; \
-       fi
-@endif libcc1
-       @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
  
@@ -48548,8 +49537,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; \
@@ -48581,294 +49570,282 @@ 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 libiconv
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-libiconv ] || \
+         mkdir stagefeedback-libiconv; \
+       mv stagefeedback-libiconv libiconv; \
+       mv stageprofile-libiconv prev-libiconv || test -f stageprofile-lean 
+@endif libiconv
  @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
-@if libcc1
-       @cd $(HOST_SUBDIR); [ -d stagefeedback-libcc1 ] || \
-         mkdir stagefeedback-libcc1; \
-       mv stagefeedback-libcc1 libcc1  ; \
-       mv stageprofile-libcc1 prev-libcc1 || test -f stageprofile-lean 
-@endif libcc1
         @[ -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 libiconv
+       @if test -d $(HOST_SUBDIR)/libiconv; then \
+         cd $(HOST_SUBDIR); mv libiconv stagefeedback-libiconv; \
+         mv prev-libiconv stageprofile-libiconv; : ; \
+       fi
+@endif libiconv
  @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 libcc1
-       @if test -d $(HOST_SUBDIR)/libcc1 ; then \
-         cd $(HOST_SUBDIR); mv libcc1 stagefeedback-libcc1 ; \
-         mv prev-libcc1 stageprofile-libcc1 ; :  ; \
-       fi
-@endif libcc1
-       @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
  
@@ -48879,8 +49856,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; \
@@ -48939,10 +49916,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
@@ -48985,6 +49962,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
@@ -48992,6 +49975,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
@@ -49027,8 +50011,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
@@ -49093,6 +50079,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
@@ -49141,6 +50151,14 @@ configure-stage3-gcc: maybe-all-stage3-libelf
  configure-stage4-gcc: maybe-all-stage4-libelf
  configure-stageprofile-gcc: maybe-all-stageprofile-libelf
  configure-stagefeedback-gcc: maybe-all-stagefeedback-libelf
+configure-gcc: maybe-all-libiconv
+
+configure-stage1-gcc: maybe-all-stage1-libiconv
+configure-stage2-gcc: maybe-all-stage2-libiconv
+configure-stage3-gcc: maybe-all-stage3-libiconv
+configure-stage4-gcc: maybe-all-stage4-libiconv
+configure-stageprofile-gcc: maybe-all-stageprofile-libiconv
+configure-stagefeedback-gcc: maybe-all-stagefeedback-libiconv
  all-gcc: all-libiberty
  
  all-stage1-gcc: all-stage1-libiberty
@@ -49173,14 +50191,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
@@ -49285,6 +50303,14 @@ all-stage3-gcc: maybe-all-stage3-lto-plugin
  all-stage4-gcc: maybe-all-stage4-lto-plugin
  all-stageprofile-gcc: maybe-all-stageprofile-lto-plugin
  all-stagefeedback-gcc: maybe-all-stagefeedback-lto-plugin
+all-gcc: maybe-all-libiconv
+
+all-stage1-gcc: maybe-all-stage1-libiconv
+all-stage2-gcc: maybe-all-stage2-libiconv
+all-stage3-gcc: maybe-all-stage3-libiconv
+all-stage4-gcc: maybe-all-stage4-libiconv
+all-stageprofile-gcc: maybe-all-stageprofile-libiconv
+all-stagefeedback-gcc: maybe-all-stagefeedback-libiconv
  info-gcc: maybe-all-build-libiberty
  
  info-stage1-gcc: maybe-all-build-libiberty
@@ -49337,6 +50363,14 @@ configure-stage3-libcpp: maybe-configure-stage3-intl
  configure-stage4-libcpp: maybe-configure-stage4-intl
  configure-stageprofile-libcpp: maybe-configure-stageprofile-intl
  configure-stagefeedback-libcpp: maybe-configure-stagefeedback-intl
+configure-libcpp: maybe-all-libiconv
+
+configure-stage1-libcpp: maybe-all-stage1-libiconv
+configure-stage2-libcpp: maybe-all-stage2-libiconv
+configure-stage3-libcpp: maybe-all-stage3-libiconv
+configure-stage4-libcpp: maybe-all-stage4-libiconv
+configure-stageprofile-libcpp: maybe-all-stageprofile-libiconv
+configure-stagefeedback-libcpp: maybe-all-stagefeedback-libiconv
  all-libcpp: all-libiberty
  
  all-stage1-libcpp: all-stage1-libiberty
@@ -49353,6 +50387,14 @@ all-stage3-libcpp: maybe-all-stage3-intl
  all-stage4-libcpp: maybe-all-stage4-intl
  all-stageprofile-libcpp: maybe-all-stageprofile-intl
  all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
+all-libcpp: maybe-all-libiconv
+
+all-stage1-libcpp: maybe-all-stage1-libiconv
+all-stage2-libcpp: maybe-all-stage2-libiconv
+all-stage3-libcpp: maybe-all-stage3-libiconv
+all-stage4-libcpp: maybe-all-stage4-libiconv
+all-stageprofile-libcpp: maybe-all-stageprofile-libiconv
+all-stagefeedback-libcpp: maybe-all-stagefeedback-libiconv
  all-fixincludes: maybe-all-libiberty
  
  all-stage1-fixincludes: maybe-all-stage1-libiberty
@@ -49380,22 +50422,17 @@ 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
-
-configure-stage1-libcc1: maybe-configure-stage1-gcc
-configure-stage2-libcc1: maybe-configure-stage2-gcc
-configure-stage3-libcc1: maybe-configure-stage3-gcc
-configure-stage4-libcc1: maybe-configure-stage4-gcc
-configure-stageprofile-libcc1: maybe-configure-stageprofile-gcc
-configure-stagefeedback-libcc1: maybe-configure-stagefeedback-gcc
  all-libcc1: maybe-all-gcc
-
-all-stage1-libcc1: maybe-all-stage1-gcc
-all-stage2-libcc1: maybe-all-stage2-gcc
-all-stage3-libcc1: maybe-all-stage3-gcc
-all-stage4-libcc1: maybe-all-stage4-gcc
-all-stageprofile-libcc1: maybe-all-stageprofile-gcc
-all-stagefeedback-libcc1: maybe-all-stagefeedback-gcc
+all-gotools: maybe-all-target-libgo
  all-utils: maybe-all-libiberty
+configure-intl: maybe-all-libiconv
+
+configure-stage1-intl: maybe-all-stage1-libiconv
+configure-stage2-intl: maybe-all-stage2-libiconv
+configure-stage3-intl: maybe-all-stage3-libiconv
+configure-stage4-intl: maybe-all-stage4-libiconv
+configure-stageprofile-intl: maybe-all-stageprofile-libiconv
+configure-stagefeedback-intl: maybe-all-stagefeedback-libiconv
  configure-mpfr: maybe-all-gmp
  
  configure-stage1-mpfr: maybe-all-stage1-gmp
@@ -49420,22 +50457,14 @@ 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
+all-intl: maybe-all-libiconv
+
+all-stage1-intl: maybe-all-stage1-libiconv
+all-stage2-intl: maybe-all-stage2-libiconv
+all-stage3-intl: maybe-all-stage3-libiconv
+all-stage4-intl: maybe-all-stage4-libiconv
+all-stageprofile-intl: maybe-all-stageprofile-libiconv
+all-stagefeedback-intl: maybe-all-stagefeedback-libiconv
  configure-gdb: maybe-all-intl
  configure-gdb: maybe-configure-sim
  configure-gdb: maybe-all-bfd
@@ -49485,6 +50514,14 @@ all-stage3-bfd: maybe-all-stage3-intl
  all-stage4-bfd: maybe-all-stage4-intl
  all-stageprofile-bfd: maybe-all-stageprofile-intl
  all-stagefeedback-bfd: maybe-all-stagefeedback-intl
+all-bfd: maybe-all-zlib
+
+all-stage1-bfd: maybe-all-stage1-zlib
+all-stage2-bfd: maybe-all-stage2-zlib
+all-stage3-bfd: maybe-all-stage3-zlib
+all-stage4-bfd: maybe-all-stage4-zlib
+all-stageprofile-bfd: maybe-all-stageprofile-zlib
+all-stagefeedback-bfd: maybe-all-stagefeedback-zlib
  configure-opcodes: configure-libiberty
  
  configure-stage1-opcodes: configure-stage1-libiberty
@@ -49852,6 +50889,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
@@ -49876,6 +50914,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
@@ -49885,6 +50924,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
@@ -49894,6 +50935,7 @@ all-target-winsup: maybe-all-target-libtermcap
  configure-target-newlib: maybe-all-binutils
  configure-target-newlib: maybe-all-ld
  configure-target-libgfortran: maybe-all-target-libquadmath
+configure-target-libgfortran: maybe-all-target-libbacktrace
  
  
  # Dependencies for target modules on other target modules are
@@ -49914,6 +50956,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
@@ -49931,8 +50979,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
@@ -49959,11 +51009,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
  
  
@@ -49984,6 +51039,7 @@ configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
  
  
  configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libffi: maybe-all-target-libstdc++-v3
  
  configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
  configure-target-libjava: maybe-all-target-libstdc++-v3
@@ -50035,7 +51091,10 @@ config.status: configure
  # Rebuilding configure.
  AUTOCONF = autoconf
  $(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \
-       $(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4
+       $(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4 \
+       $(srcdir)/config/elf.m4 $(srcdir)/config/isl.m4 \
+       $(srcdir)/libtool.m4 $(srcdir)/ltoptions.m4 $(srcdir)/ltsugar.m4 \
+       $(srcdir)/ltversion.m4 $(srcdir)/lt~obsolete.m4
         cd $(srcdir) && $(AUTOCONF)
  
  # ------------------------------