Fix previous ChangeLog entry

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

index ba5ae4c2ecb23535da040fec1ccd3e2e23cf7c87..e9b59502a2c0aeccbace06be1e7a1b105cac6dd6 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,8 +222,9 @@ HOST_EXPORTS = \
         GMPINC="$(HOST_GMPINC)"; export GMPINC; \
         ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
         ISLINC="$(HOST_ISLINC)"; export ISLINC; \
-       LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \
-       LIBELFINC="$(HOST_LIBELFINC)" ; export LIBELFINC; \
+       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
@@ -285,6 +287,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; \
@@ -309,7 +312,7 @@ NORMAL_TARGET_EXPORTS = \
  HOST_GMPLIBS = @gmplibs@
  HOST_GMPINC = @gmpinc@
  
-# Where to find ISL
+# Where to find isl
  HOST_ISLLIBS = @isllibs@
  HOST_ISLINC = @islinc@
  
@@ -480,11 +483,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@
@@ -533,6 +534,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@
@@ -574,7 +576,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_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
+TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_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:
@@ -584,6 +586,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
@@ -670,7 +676,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)" \
@@ -751,6 +759,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)" \
@@ -825,6 +834,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
@@ -835,7 +852,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)' \
@@ -848,11 +867,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)
@@ -923,11 +945,13 @@ 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 \
@@ -1056,7 +1080,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
@@ -1076,6 +1102,7 @@ all-host: maybe-all-gnattools
  all-host: maybe-all-lto-plugin
  @endif lto-plugin-no-bootstrap
  all-host: maybe-all-libcc1
+all-host: maybe-all-gotools
  
  .PHONY: all-target
  
@@ -1085,6 +1112,9 @@ all-target: maybe-all-target-libstdc++-v3
  @if target-libsanitizer-no-bootstrap
  all-target: maybe-all-target-libsanitizer
  @endif target-libsanitizer-no-bootstrap
+@if target-libmpx-no-bootstrap
+all-target: maybe-all-target-libmpx
+@endif target-libmpx-no-bootstrap
  @if target-libvtv-no-bootstrap
  all-target: maybe-all-target-libvtv
  @endif target-libvtv-no-bootstrap
@@ -1176,11 +1206,13 @@ 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
@@ -1261,11 +1293,13 @@ 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
@@ -1346,11 +1380,13 @@ 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
@@ -1431,11 +1467,13 @@ 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
@@ -1516,11 +1554,13 @@ 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
@@ -1601,11 +1641,13 @@ 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
@@ -1686,11 +1728,13 @@ 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
@@ -1771,11 +1815,13 @@ 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
@@ -1856,11 +1902,13 @@ 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
@@ -1941,11 +1989,13 @@ 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
@@ -2026,11 +2076,13 @@ 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
@@ -2111,11 +2163,13 @@ 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
@@ -2196,11 +2250,13 @@ 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
@@ -2244,9 +2300,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
  
@@ -2335,12 +2391,14 @@ 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 \
@@ -2395,15 +2453,24 @@ mail-report-with-warnings.log: warning.log
  # Local Vim config
  
  $(srcdir)/.local.vimrc:
-       $(LN_S) $(srcdir)/contrib/vimrc $@
+       $(LN_S) contrib/vimrc $@
  
  $(srcdir)/.lvimrc:
-       $(LN_S) $(srcdir)/contrib/vimrc $@
+       $(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
@@ -2458,7 +2525,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:  \
@@ -2506,12 +2574,14 @@ 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 \
@@ -2541,14 +2611,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
@@ -2611,12 +2681,14 @@ 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 \
@@ -2652,10 +2724,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 +2769,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 +2826,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 +2883,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 +2940,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 +2997,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 +3054,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 +3111,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 +3172,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 +3207,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 +3240,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 +3253,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 +3273,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 +3286,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 +3306,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 +3319,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 +3339,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 +3352,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 +3372,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 +3385,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 +3671,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 +3723,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 +3748,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 +3773,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 +3798,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 +3823,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 +3849,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 +3875,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 +3901,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 +3926,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 +3950,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 +3974,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 +3998,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 +4022,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 +4046,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 +4081,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 +4114,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 +4127,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 +4147,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 +4160,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 +4180,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 +4193,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 +4213,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 +4226,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 +4246,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 +4259,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 +4545,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 +4597,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 +4622,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 +4647,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 +4672,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 +4697,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 +4723,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 +4749,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 +4775,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 +4800,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 +4824,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 +4848,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 +4872,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 +4896,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 +4920,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 +4955,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 +4988,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 +5001,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 +5021,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 +5034,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 +5054,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 +5067,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 +5087,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 +5100,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 +5120,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 +5133,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 +5419,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 +5471,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 +5496,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 +5521,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 +5546,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 +5571,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 +5597,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 +5623,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 +5649,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 +5674,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 +5698,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 +5722,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 +5746,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 +5770,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 +5795,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 +5846,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 +5903,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 +5929,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 +5955,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 +5981,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 +6007,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 +6034,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 +6061,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 +6088,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 +6114,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 +6139,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 +6164,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 +6189,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 +6214,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 +6239,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 +6291,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 +6344,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 +6370,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 +6396,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 +6422,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 +6448,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 +6475,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 +6502,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 +6529,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 +6555,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 +6580,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 +6605,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 +6630,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 +6655,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 +6680,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 +6732,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 +6785,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 +6811,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 +6837,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 +6863,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 +6889,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 +6916,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 +6943,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 +6970,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 +6996,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 +7021,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 +7046,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 +7071,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 +7096,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 +7121,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 +7173,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 +7226,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 +7252,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 +7278,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 +7304,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 +7330,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 +7357,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 +7384,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 +7411,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 +7437,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 +7462,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 +7487,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 +7512,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 +7537,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 +7562,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 +7613,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 +7670,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 +7696,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 +7722,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 +7748,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 +7774,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 +7801,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 +7828,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 +7855,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 +7881,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 +7906,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 +7931,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 +7956,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 +7981,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 +8005,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 +8040,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 +8073,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 +8086,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 +8106,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 +8119,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 +8139,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 +8152,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 +8172,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 +8185,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 +8205,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 +8218,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 +8504,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 +8556,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 +8581,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 +8606,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 +8631,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 +8667,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 +8693,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 +8719,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 +8744,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 +8768,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 +8792,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 +8816,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 +8840,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 +8865,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 +8916,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 +8973,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 +8999,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 +9025,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 +9051,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 +9077,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 +9104,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 +9131,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 +9158,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 +9184,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 +9209,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 +9234,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 +9259,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 +9284,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 +9308,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 +9343,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 +9376,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 +9389,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 +9409,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 +9422,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 +9442,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 +9455,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 +9475,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 +9488,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 +9508,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 +9521,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 +9807,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 +9859,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 +9884,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 +9909,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 +9934,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 +9959,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 +9985,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 +10011,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 +10037,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 +10062,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 +10086,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 +10110,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 +10134,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 +10158,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 +10182,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 +10217,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 +10250,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 +10263,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 +10283,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 +10296,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 +10316,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 +10329,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 +10349,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 +10362,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 +10382,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 +10395,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 +10681,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 +10733,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 +10758,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 +10783,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 +10808,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 +10833,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 +10859,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 +10885,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 +10911,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 +10936,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 +10960,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 +10984,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 +11008,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 +11032,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 +11056,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; \
@@ -11019,8 +11091,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) ;; \
@@ -11053,8 +11125,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,7 +11138,7 @@ 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 LEX="touch lex.yy.c"
  @endif gmp-bootstrap
@@ -11087,8 +11159,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,7 +11172,7 @@ 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 LEX="touch lex.yy.c"
  @endif gmp-bootstrap
@@ -11121,8 +11193,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,7 +11206,7 @@ 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 LEX="touch lex.yy.c"
  @endif gmp-bootstrap
@@ -11155,8 +11227,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,7 +11240,7 @@ 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 LEX="touch lex.yy.c"
  @endif gmp-bootstrap
@@ -11189,8 +11261,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,7 +11274,7 @@ 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 LEX="touch lex.yy.c"
  @endif gmp-bootstrap
@@ -11489,9 +11561,9 @@ check-gmp:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gmp && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
  
  @endif gmp
  
@@ -11529,7 +11601,7 @@ info-gmp: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gmp" ; \
+       echo "Doing info in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11554,7 +11626,7 @@ dvi-gmp: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gmp" ; \
+       echo "Doing dvi in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11579,7 +11651,7 @@ pdf-gmp: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in gmp" ; \
+       echo "Doing pdf in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11604,7 +11676,7 @@ html-gmp: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in gmp" ; \
+       echo "Doing html in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11629,7 +11701,7 @@ TAGS-gmp: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gmp" ; \
+       echo "Doing TAGS in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11655,7 +11727,7 @@ install-info-gmp: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gmp" ; \
+       echo "Doing install-info in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11681,7 +11753,7 @@ install-pdf-gmp: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in gmp" ; \
+       echo "Doing install-pdf in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11707,7 +11779,7 @@ install-html-gmp: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in gmp" ; \
+       echo "Doing install-html in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11732,7 +11804,7 @@ installcheck-gmp: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gmp" ; \
+       echo "Doing installcheck in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11756,7 +11828,7 @@ mostlyclean-gmp:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gmp" ; \
+       echo "Doing mostlyclean in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11780,7 +11852,7 @@ clean-gmp:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gmp" ; \
+       echo "Doing clean in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11804,7 +11876,7 @@ distclean-gmp:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gmp" ; \
+       echo "Doing distclean in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11828,7 +11900,7 @@ maintainer-clean-gmp:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gmp" ; \
+       echo "Doing maintainer-clean in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11852,7 +11924,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 +11959,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 +11993,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 +12006,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 +12027,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 +12040,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 +12061,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 +12074,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 +12095,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 +12108,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 +12129,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 +12142,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
@@ -12357,9 +12429,9 @@ check-mpfr:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/mpfr && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
  
  @endif mpfr
  
@@ -12397,7 +12469,7 @@ info-mpfr: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in mpfr" ; \
+       echo "Doing info in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12422,7 +12494,7 @@ dvi-mpfr: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in mpfr" ; \
+       echo "Doing dvi in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12447,7 +12519,7 @@ pdf-mpfr: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in mpfr" ; \
+       echo "Doing pdf in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12472,7 +12544,7 @@ html-mpfr: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in mpfr" ; \
+       echo "Doing html in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12497,7 +12569,7 @@ TAGS-mpfr: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in mpfr" ; \
+       echo "Doing TAGS in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12523,7 +12595,7 @@ install-info-mpfr: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in mpfr" ; \
+       echo "Doing install-info in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12549,7 +12621,7 @@ install-pdf-mpfr: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in mpfr" ; \
+       echo "Doing install-pdf in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12575,7 +12647,7 @@ install-html-mpfr: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in mpfr" ; \
+       echo "Doing install-html in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12600,7 +12672,7 @@ installcheck-mpfr: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in mpfr" ; \
+       echo "Doing installcheck in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12624,7 +12696,7 @@ mostlyclean-mpfr:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in mpfr" ; \
+       echo "Doing mostlyclean in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12648,7 +12720,7 @@ clean-mpfr:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in mpfr" ; \
+       echo "Doing clean in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12672,7 +12744,7 @@ distclean-mpfr:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in mpfr" ; \
+       echo "Doing distclean in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12696,7 +12768,7 @@ maintainer-clean-mpfr:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in mpfr" ; \
+       echo "Doing maintainer-clean in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12720,7 +12792,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 +12827,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 +12861,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 +12874,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 +12895,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 +12908,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 +12929,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 +12942,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 +12963,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 +12976,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 +12997,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 +13010,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 +13297,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 +13337,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 +13362,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 +13387,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 +13412,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 +13437,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 +13463,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 +13489,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 +13515,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 +13540,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 +13564,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 +13588,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 +13612,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 +13636,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 +13660,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 +13695,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 +13729,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 +13742,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 +13763,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 +13776,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 +13797,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 +13810,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 +13831,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 +13844,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 +13865,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 +13878,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 +14165,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 +14205,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 +14230,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 +14255,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 +14280,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 +14305,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 +14331,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 +14357,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 +14383,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 +14408,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 +14432,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 +14456,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 +14480,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 +14504,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}" \
@@ -14456,7 +14528,7 @@ configure-libelf:
         @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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
         $(HOST_EXPORTS)  \
         echo Configuring in $(HOST_SUBDIR)/libelf; \
         cd "$(HOST_SUBDIR)/libelf" || exit 1; \
@@ -14491,8 +14563,8 @@ configure-stage1-libelf:
         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 ; \
+       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) ;; \
@@ -14525,8 +14597,8 @@ configure-stage2-libelf:
         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 ; \
+       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) ;; \
@@ -14538,7 +14610,7 @@ configure-stage2-libelf:
           --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
  @endif libelf-bootstrap
@@ -14559,8 +14631,8 @@ configure-stage3-libelf:
         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 ; \
+       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) ;; \
@@ -14572,7 +14644,7 @@ configure-stage3-libelf:
           --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
  @endif libelf-bootstrap
@@ -14593,8 +14665,8 @@ configure-stage4-libelf:
         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 ; \
+       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) ;; \
@@ -14606,7 +14678,7 @@ configure-stage4-libelf:
           --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
  @endif libelf-bootstrap
@@ -14627,8 +14699,8 @@ configure-stageprofile-libelf:
         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 ; \
+       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) ;; \
@@ -14640,7 +14712,7 @@ configure-stageprofile-libelf:
           --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
  @endif libelf-bootstrap
@@ -14661,8 +14733,8 @@ configure-stagefeedback-libelf:
         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 ; \
+       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) ;; \
@@ -14674,7 +14746,7 @@ configure-stagefeedback-libelf:
           --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
  @endif libelf-bootstrap
@@ -14961,9 +15033,9 @@ check-libelf:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libelf && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
  
  @endif libelf
  
@@ -15001,7 +15073,7 @@ info-libelf: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in libelf" ; \
+       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}" \
@@ -15026,7 +15098,7 @@ dvi-libelf: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in libelf" ; \
+       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}" \
@@ -15051,7 +15123,7 @@ pdf-libelf: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in libelf" ; \
+       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}" \
@@ -15076,7 +15148,7 @@ html-libelf: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in libelf" ; \
+       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}" \
@@ -15101,7 +15173,7 @@ TAGS-libelf: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in libelf" ; \
+       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}" \
@@ -15127,7 +15199,7 @@ install-info-libelf: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in libelf" ; \
+       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}" \
@@ -15153,7 +15225,7 @@ install-pdf-libelf: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in libelf" ; \
+       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}" \
@@ -15179,7 +15251,7 @@ install-html-libelf: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in libelf" ; \
+       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}" \
@@ -15204,7 +15276,7 @@ installcheck-libelf: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in libelf" ; \
+       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}" \
@@ -15228,7 +15300,7 @@ mostlyclean-libelf:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in libelf" ; \
+       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}" \
@@ -15252,7 +15324,7 @@ clean-libelf:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in libelf" ; \
+       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}" \
@@ -15276,7 +15348,7 @@ distclean-libelf:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in libelf" ; \
+       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}" \
@@ -15300,7 +15372,7 @@ maintainer-clean-libelf:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in libelf" ; \
+       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}" \
@@ -15324,7 +15396,7 @@ configure-gold:
         @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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
         $(HOST_EXPORTS)  \
         echo Configuring in $(HOST_SUBDIR)/gold; \
         cd "$(HOST_SUBDIR)/gold" || exit 1; \
@@ -15359,8 +15431,8 @@ configure-stage1-gold:
         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 ; \
+       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) ;; \
@@ -15392,8 +15464,8 @@ configure-stage2-gold:
         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 ; \
+       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) ;; \
@@ -15405,7 +15477,7 @@ configure-stage2-gold:
           --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 gold-bootstrap
  
@@ -15425,8 +15497,8 @@ configure-stage3-gold:
         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 ; \
+       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) ;; \
@@ -15438,7 +15510,7 @@ configure-stage3-gold:
           --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 gold-bootstrap
  
@@ -15458,8 +15530,8 @@ configure-stage4-gold:
         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 ; \
+       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) ;; \
@@ -15471,7 +15543,7 @@ configure-stage4-gold:
           --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 gold-bootstrap
  
@@ -15491,8 +15563,8 @@ configure-stageprofile-gold:
         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 ; \
+       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) ;; \
@@ -15504,7 +15576,7 @@ configure-stageprofile-gold:
           --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 gold-bootstrap
  
@@ -15524,8 +15596,8 @@ configure-stagefeedback-gold:
         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 ; \
+       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) ;; \
@@ -15537,7 +15609,7 @@ configure-stagefeedback-gold:
           --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 gold-bootstrap
  
@@ -15823,9 +15895,9 @@ check-gold:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gold && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
  
  @endif gold
  
@@ -15875,7 +15947,7 @@ info-gold: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gold" ; \
+       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}" \
@@ -15900,7 +15972,7 @@ dvi-gold: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gold" ; \
+       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}" \
@@ -15925,7 +15997,7 @@ pdf-gold: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in gold" ; \
+       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}" \
@@ -15950,7 +16022,7 @@ html-gold: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in gold" ; \
+       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}" \
@@ -15975,7 +16047,7 @@ TAGS-gold: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gold" ; \
+       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}" \
@@ -16001,7 +16073,7 @@ install-info-gold: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gold" ; \
+       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}" \
@@ -16027,7 +16099,7 @@ install-pdf-gold: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in gold" ; \
+       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}" \
@@ -16053,7 +16125,7 @@ install-html-gold: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in gold" ; \
+       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}" \
@@ -16078,7 +16150,7 @@ installcheck-gold: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gold" ; \
+       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}" \
@@ -16102,7 +16174,7 @@ mostlyclean-gold:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gold" ; \
+       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}" \
@@ -16126,7 +16198,7 @@ clean-gold:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gold" ; \
+       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}" \
@@ -16150,7 +16222,7 @@ distclean-gold:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gold" ; \
+       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}" \
@@ -16174,7 +16246,7 @@ maintainer-clean-gold:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gold" ; \
+       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}" \
@@ -16199,7 +16271,7 @@ configure-gprof:
         @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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof; \
         $(HOST_EXPORTS)  \
         echo Configuring in $(HOST_SUBDIR)/gprof; \
         cd "$(HOST_SUBDIR)/gprof" || exit 1; \
@@ -16251,7 +16323,7 @@ check-gprof:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
  
@@ -16304,7 +16376,7 @@ info-gprof: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gprof" ; \
+       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}" \
@@ -16330,7 +16402,7 @@ dvi-gprof: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gprof" ; \
+       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}" \
@@ -16356,7 +16428,7 @@ pdf-gprof: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in gprof" ; \
+       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}" \
@@ -16382,7 +16454,7 @@ html-gprof: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in gprof" ; \
+       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}" \
@@ -16408,7 +16480,7 @@ TAGS-gprof: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gprof" ; \
+       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}" \
@@ -16435,7 +16507,7 @@ install-info-gprof: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gprof" ; \
+       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}" \
@@ -16462,7 +16534,7 @@ install-pdf-gprof: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in gprof" ; \
+       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}" \
@@ -16489,7 +16561,7 @@ install-html-gprof: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in gprof" ; \
+       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}" \
@@ -16515,7 +16587,7 @@ installcheck-gprof: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gprof" ; \
+       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}" \
@@ -16540,7 +16612,7 @@ mostlyclean-gprof:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gprof" ; \
+       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}" \
@@ -16565,7 +16637,7 @@ clean-gprof:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gprof" ; \
+       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}" \
@@ -16590,7 +16662,7 @@ distclean-gprof:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gprof" ; \
+       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}" \
@@ -16615,7 +16687,7 @@ maintainer-clean-gprof:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gprof" ; \
+       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}" \
@@ -16639,7 +16711,7 @@ 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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
         $(HOST_EXPORTS)  \
         echo Configuring in $(HOST_SUBDIR)/intl; \
         cd "$(HOST_SUBDIR)/intl" || exit 1; \
@@ -16674,8 +16746,8 @@ configure-stage1-intl:
         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) ;; \
@@ -16707,8 +16779,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) ;; \
@@ -16720,7 +16792,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
  
@@ -16740,8 +16812,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) ;; \
@@ -16753,7 +16825,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
  
@@ -16773,8 +16845,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) ;; \
@@ -16786,7 +16858,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
  
@@ -16806,8 +16878,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) ;; \
@@ -16819,7 +16891,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
  
@@ -16839,8 +16911,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) ;; \
@@ -16852,7 +16924,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
  
@@ -17138,9 +17210,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
  
@@ -17190,7 +17262,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}" \
@@ -17215,7 +17287,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}" \
@@ -17240,7 +17312,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}" \
@@ -17265,7 +17337,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}" \
@@ -17290,7 +17362,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}" \
@@ -17316,7 +17388,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}" \
@@ -17342,7 +17414,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}" \
@@ -17368,7 +17440,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}" \
@@ -17393,7 +17465,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}" \
@@ -17417,7 +17489,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}" \
@@ -17441,7 +17513,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}" \
@@ -17465,7 +17537,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}" \
@@ -17489,7 +17561,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}" \
@@ -17514,7 +17586,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; \
@@ -17566,7 +17638,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)
  
@@ -17619,7 +17691,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}" \
@@ -17645,7 +17717,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}" \
@@ -17671,7 +17743,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}" \
@@ -17697,7 +17769,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}" \
@@ -17723,7 +17795,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}" \
@@ -17750,7 +17822,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}" \
@@ -17777,7 +17849,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}" \
@@ -17804,7 +17876,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}" \
@@ -17830,7 +17902,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}" \
@@ -17865,7 +17937,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}" \
@@ -17890,7 +17962,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}" \
@@ -17915,7 +17987,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}" \
@@ -17940,7 +18012,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; \
@@ -17992,7 +18064,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)
  
@@ -18045,7 +18117,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}" \
@@ -18071,7 +18143,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}" \
@@ -18097,7 +18169,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}" \
@@ -18123,7 +18195,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}" \
@@ -18149,7 +18221,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}" \
@@ -18176,7 +18248,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}" \
@@ -18203,7 +18275,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}" \
@@ -18230,7 +18302,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}" \
@@ -18256,7 +18328,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}" \
@@ -18281,7 +18353,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}" \
@@ -18306,7 +18378,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}" \
@@ -18331,7 +18403,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}" \
@@ -18356,7 +18428,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}" \
@@ -18380,7 +18452,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; \
@@ -18415,8 +18487,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) ;; \
@@ -18448,8 +18520,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) ;; \
@@ -18461,7 +18533,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
  
@@ -18481,8 +18553,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) ;; \
@@ -18494,7 +18566,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
  
@@ -18514,8 +18586,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) ;; \
@@ -18527,7 +18599,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
  
@@ -18547,8 +18619,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) ;; \
@@ -18560,7 +18632,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
  
@@ -18580,8 +18652,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) ;; \
@@ -18593,7 +18665,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
  
@@ -18879,9 +18951,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
  
@@ -18931,7 +19003,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}" \
@@ -18956,7 +19028,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}" \
@@ -18981,7 +19053,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}" \
@@ -19006,7 +19078,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}" \
@@ -19031,7 +19103,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}" \
@@ -19057,7 +19129,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}" \
@@ -19083,7 +19155,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}" \
@@ -19109,7 +19181,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}" \
@@ -19134,7 +19206,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}" \
@@ -19158,7 +19230,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}" \
@@ -19182,7 +19254,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}" \
@@ -19206,7 +19278,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}" \
@@ -19230,7 +19302,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}" \
@@ -19254,7 +19326,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; \
@@ -19289,8 +19361,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) ;; \
@@ -19322,8 +19394,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) ;; \
@@ -19335,7 +19407,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
  
@@ -19355,8 +19427,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) ;; \
@@ -19368,7 +19440,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
  
@@ -19388,8 +19460,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) ;; \
@@ -19401,7 +19473,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
  
@@ -19421,8 +19493,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) ;; \
@@ -19434,7 +19506,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
  
@@ -19454,8 +19526,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) ;; \
@@ -19467,7 +19539,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
  
@@ -19753,9 +19825,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
  
@@ -19805,7 +19877,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}" \
@@ -19830,7 +19902,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}" \
@@ -19855,7 +19927,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}" \
@@ -19880,7 +19952,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}" \
@@ -19905,7 +19977,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}" \
@@ -19931,7 +20003,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}" \
@@ -19957,7 +20029,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}" \
@@ -19983,7 +20055,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}" \
@@ -20008,7 +20080,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}" \
@@ -20032,7 +20104,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}" \
@@ -20056,7 +20128,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}" \
@@ -20080,7 +20152,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}" \
@@ -20104,7 +20176,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}" \
@@ -20128,7 +20200,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; \
@@ -20163,8 +20235,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) ;; \
@@ -20196,8 +20268,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) ;; \
@@ -20209,7 +20281,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
  
@@ -20229,8 +20301,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) ;; \
@@ -20242,7 +20314,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
  
@@ -20262,8 +20334,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) ;; \
@@ -20275,7 +20347,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
  
@@ -20295,8 +20367,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) ;; \
@@ -20308,7 +20380,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
  
@@ -20328,8 +20400,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) ;; \
@@ -20341,7 +20413,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
  
@@ -20627,9 +20699,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
  
@@ -20679,7 +20751,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}" \
@@ -20704,7 +20776,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}" \
@@ -20729,7 +20801,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}" \
@@ -20754,7 +20826,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}" \
@@ -20779,7 +20851,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}" \
@@ -20805,7 +20877,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}" \
@@ -20831,7 +20903,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}" \
@@ -20857,7 +20929,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}" \
@@ -20882,7 +20954,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}" \
@@ -20906,7 +20978,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}" \
@@ -20930,7 +21002,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}" \
@@ -20954,7 +21026,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}" \
@@ -20978,7 +21050,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}" \
@@ -21002,7 +21074,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; \
@@ -21037,8 +21109,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) ;; \
@@ -21070,8 +21142,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) ;; \
@@ -21083,7 +21155,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
  
@@ -21103,8 +21175,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) ;; \
@@ -21116,7 +21188,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
  
@@ -21136,8 +21208,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) ;; \
@@ -21149,7 +21221,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
  
@@ -21169,8 +21241,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) ;; \
@@ -21182,7 +21254,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
  
@@ -21202,8 +21274,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) ;; \
@@ -21215,7 +21287,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
  
@@ -21501,9 +21573,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
  
@@ -21553,7 +21625,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}" \
@@ -21578,7 +21650,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}" \
@@ -21603,7 +21675,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}" \
@@ -21628,7 +21700,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}" \
@@ -21653,7 +21725,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}" \
@@ -21679,7 +21751,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}" \
@@ -21705,7 +21777,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}" \
@@ -21731,7 +21803,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}" \
@@ -21756,7 +21828,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}" \
@@ -21780,7 +21852,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}" \
@@ -21804,7 +21876,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}" \
@@ -21828,7 +21900,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}" \
@@ -21852,7 +21924,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}" \
@@ -21877,7 +21949,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; \
@@ -21929,7 +22001,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)
  
@@ -21982,7 +22054,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}" \
@@ -22008,7 +22080,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}" \
@@ -22034,7 +22106,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}" \
@@ -22060,7 +22132,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}" \
@@ -22086,7 +22158,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}" \
@@ -22113,7 +22185,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}" \
@@ -22140,7 +22212,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}" \
@@ -22167,7 +22239,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}" \
@@ -22193,7 +22265,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}" \
@@ -22218,7 +22290,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}" \
@@ -22243,7 +22315,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}" \
@@ -22268,7 +22340,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}" \
@@ -22293,7 +22365,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}" \
@@ -22317,7 +22389,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; \
@@ -22352,8 +22424,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) ;; \
@@ -22386,8 +22458,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) ;; \
@@ -22399,7 +22471,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
@@ -22420,8 +22492,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) ;; \
@@ -22433,7 +22505,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
@@ -22454,8 +22526,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) ;; \
@@ -22467,7 +22539,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
@@ -22488,8 +22560,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) ;; \
@@ -22501,7 +22573,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
@@ -22522,8 +22594,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) ;; \
@@ -22535,7 +22607,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
@@ -22822,9 +22894,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
  
@@ -22874,7 +22946,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}" \
@@ -22899,7 +22971,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}" \
@@ -22924,7 +22996,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}" \
@@ -22949,7 +23021,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}" \
@@ -22974,7 +23046,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}" \
@@ -23000,7 +23072,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}" \
@@ -23026,7 +23098,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}" \
@@ -23052,7 +23124,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}" \
@@ -23077,7 +23149,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}" \
@@ -23101,7 +23173,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}" \
@@ -23125,7 +23197,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}" \
@@ -23149,7 +23221,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}" \
@@ -23173,7 +23245,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}" \
@@ -23197,7 +23269,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; \
@@ -23232,8 +23304,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) ;; \
@@ -23266,8 +23338,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) ;; \
@@ -23279,7 +23351,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
@@ -23300,8 +23372,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) ;; \
@@ -23313,7 +23385,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
@@ -23334,8 +23406,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) ;; \
@@ -23347,7 +23419,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
@@ -23368,8 +23440,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) ;; \
@@ -23381,7 +23453,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
@@ -23402,8 +23474,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) ;; \
@@ -23415,7 +23487,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
@@ -23702,9 +23774,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
  
@@ -23754,7 +23826,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}" \
@@ -23779,7 +23851,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}" \
@@ -23804,7 +23876,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}" \
@@ -23829,7 +23901,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}" \
@@ -23854,7 +23926,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}" \
@@ -23880,7 +23952,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}" \
@@ -23906,7 +23978,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}" \
@@ -23932,7 +24004,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}" \
@@ -23957,7 +24029,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}" \
@@ -23981,7 +24053,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}" \
@@ -24005,7 +24077,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}" \
@@ -24029,7 +24101,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}" \
@@ -24053,7 +24125,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}" \
@@ -24074,11 +24146,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; \
@@ -24098,6 +24169,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
@@ -24109,7 +24385,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)  \
@@ -24120,6 +24395,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:
@@ -24130,9 +24654,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
  
@@ -24161,24 +24685,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
  
@@ -24189,7 +24697,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; \
@@ -24197,7 +24704,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}" \
@@ -24213,24 +24720,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
  
@@ -24239,24 +24730,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
  
@@ -24267,7 +24742,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; \
@@ -24275,7 +24749,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}" \
@@ -24323,7 +24797,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; \
@@ -24331,7 +24804,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}" \
@@ -24348,7 +24821,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; \
@@ -24356,7 +24828,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}" \
@@ -24373,7 +24845,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; \
@@ -24381,7 +24852,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}" \
@@ -24398,7 +24869,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; \
@@ -24406,7 +24876,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}" \
@@ -24423,7 +24893,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; \
@@ -24431,7 +24900,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}" \
@@ -24456,7 +24925,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; \
@@ -24508,7 +24977,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)
  
@@ -24561,7 +25030,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}" \
@@ -24587,7 +25056,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}" \
@@ -24613,7 +25082,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}" \
@@ -24639,7 +25108,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}" \
@@ -24665,7 +25134,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}" \
@@ -24692,7 +25161,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}" \
@@ -24719,7 +25188,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}" \
@@ -24746,7 +25215,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}" \
@@ -24772,7 +25241,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}" \
@@ -24797,7 +25266,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}" \
@@ -24822,7 +25291,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}" \
@@ -24847,7 +25316,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}" \
@@ -24872,7 +25341,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}" \
@@ -24897,7 +25366,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; \
@@ -24949,7 +25418,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)
  
@@ -25002,7 +25471,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}" \
@@ -25028,7 +25497,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}" \
@@ -25054,7 +25523,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}" \
@@ -25080,7 +25549,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}" \
@@ -25106,7 +25575,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}" \
@@ -25133,7 +25602,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}" \
@@ -25160,7 +25629,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}" \
@@ -25187,7 +25656,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}" \
@@ -25213,7 +25682,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}" \
@@ -25238,7 +25707,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}" \
@@ -25263,7 +25732,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}" \
@@ -25288,7 +25757,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}" \
@@ -25313,7 +25782,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}" \
@@ -25338,7 +25807,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; \
@@ -25390,7 +25859,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)
  
@@ -25443,7 +25912,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}" \
@@ -25469,7 +25938,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}" \
@@ -25495,7 +25964,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}" \
@@ -25521,7 +25990,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}" \
@@ -25547,7 +26016,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}" \
@@ -25574,7 +26043,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}" \
@@ -25601,7 +26070,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}" \
@@ -25628,7 +26097,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}" \
@@ -25654,7 +26123,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}" \
@@ -25679,7 +26148,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}" \
@@ -25704,7 +26173,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}" \
@@ -25729,7 +26198,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}" \
@@ -25754,7 +26223,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}" \
@@ -25779,7 +26248,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; \
@@ -25831,7 +26300,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)
  
@@ -25884,7 +26353,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}" \
@@ -25910,7 +26379,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}" \
@@ -25936,7 +26405,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}" \
@@ -25962,7 +26431,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}" \
@@ -25988,7 +26457,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}" \
@@ -26015,7 +26484,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}" \
@@ -26042,7 +26511,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}" \
@@ -26069,7 +26538,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}" \
@@ -26095,7 +26564,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}" \
@@ -26120,7 +26589,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}" \
@@ -26145,7 +26614,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}" \
@@ -26170,7 +26639,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}" \
@@ -26195,7 +26664,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}" \
@@ -26220,7 +26689,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; \
@@ -26272,7 +26741,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)
  
@@ -26313,7 +26782,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}" \
@@ -26339,7 +26808,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}" \
@@ -26365,7 +26834,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}" \
@@ -26391,7 +26860,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}" \
@@ -26417,7 +26886,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}" \
@@ -26444,7 +26913,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}" \
@@ -26471,7 +26940,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}" \
@@ -26498,7 +26967,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}" \
@@ -26524,7 +26993,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}" \
@@ -26549,7 +27018,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}" \
@@ -26574,7 +27043,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}" \
@@ -26599,7 +27068,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}" \
@@ -26624,7 +27093,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}" \
@@ -26648,7 +27117,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; \
@@ -26662,7 +27131,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
  
@@ -26683,8 +27152,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) ;; \
@@ -26697,7 +27166,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
@@ -26716,8 +27186,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) ;; \
@@ -26729,8 +27199,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
@@ -26749,8 +27220,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) ;; \
@@ -26762,8 +27233,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
@@ -26782,8 +27254,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) ;; \
@@ -26795,8 +27267,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
@@ -26815,8 +27288,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) ;; \
@@ -26828,8 +27301,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
@@ -26848,8 +27322,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) ;; \
@@ -26861,8 +27335,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
  
  
@@ -27181,7 +27656,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}" \
@@ -27206,7 +27681,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}" \
@@ -27231,7 +27706,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}" \
@@ -27256,7 +27731,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}" \
@@ -27281,7 +27756,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}" \
@@ -27307,7 +27782,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}" \
@@ -27333,7 +27808,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}" \
@@ -27359,7 +27834,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}" \
@@ -27384,7 +27859,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}" \
@@ -27408,7 +27883,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}" \
@@ -27432,7 +27907,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}" \
@@ -27456,7 +27931,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}" \
@@ -27480,7 +27955,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}" \
@@ -27505,7 +27980,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; \
@@ -27557,7 +28032,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)
  
@@ -27610,7 +28085,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}" \
@@ -27636,7 +28111,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}" \
@@ -27662,7 +28137,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}" \
@@ -27688,7 +28163,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}" \
@@ -27714,7 +28189,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}" \
@@ -27741,7 +28216,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}" \
@@ -27768,7 +28243,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}" \
@@ -27795,7 +28270,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}" \
@@ -27821,7 +28296,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}" \
@@ -27846,7 +28321,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}" \
@@ -27871,7 +28346,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}" \
@@ -27896,7 +28371,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}" \
@@ -27921,7 +28396,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}" \
@@ -27946,7 +28421,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; \
@@ -27998,7 +28473,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)
  
@@ -28051,7 +28526,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}" \
@@ -28077,7 +28552,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}" \
@@ -28103,7 +28578,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}" \
@@ -28129,7 +28604,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}" \
@@ -28155,7 +28630,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}" \
@@ -28182,7 +28657,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}" \
@@ -28209,7 +28684,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}" \
@@ -28236,7 +28711,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}" \
@@ -28262,7 +28737,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}" \
@@ -28287,7 +28762,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}" \
@@ -28312,7 +28787,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}" \
@@ -28337,7 +28812,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}" \
@@ -28362,7 +28837,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}" \
@@ -28387,7 +28862,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; \
@@ -28439,7 +28914,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)
  
@@ -28492,7 +28967,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}" \
@@ -28518,7 +28993,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}" \
@@ -28544,7 +29019,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}" \
@@ -28570,7 +29045,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}" \
@@ -28596,7 +29071,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}" \
@@ -28623,7 +29098,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}" \
@@ -28650,7 +29125,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}" \
@@ -28677,7 +29152,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}" \
@@ -28703,7 +29178,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}" \
@@ -28728,7 +29203,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}" \
@@ -28753,7 +29228,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}" \
@@ -28778,7 +29253,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}" \
@@ -28803,7 +29278,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}" \
@@ -28828,7 +29303,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; \
@@ -28880,7 +29355,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)
  
@@ -28933,7 +29408,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}" \
@@ -28959,7 +29434,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}" \
@@ -28985,7 +29460,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}" \
@@ -29011,7 +29486,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}" \
@@ -29037,7 +29512,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}" \
@@ -29064,7 +29539,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}" \
@@ -29091,7 +29566,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}" \
@@ -29118,7 +29593,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}" \
@@ -29144,7 +29619,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}" \
@@ -29169,7 +29644,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}" \
@@ -29194,7 +29669,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}" \
@@ -29219,7 +29694,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}" \
@@ -29244,7 +29719,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}" \
@@ -29269,7 +29744,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; \
@@ -29368,7 +29843,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}" \
@@ -29394,7 +29869,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}" \
@@ -29420,7 +29895,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}" \
@@ -29446,7 +29921,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}" \
@@ -29472,7 +29947,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}" \
@@ -29499,7 +29974,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}" \
@@ -29526,7 +30001,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}" \
@@ -29553,7 +30028,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}" \
@@ -29579,7 +30054,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}" \
@@ -29644,7 +30119,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; \
@@ -29743,7 +30218,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}" \
@@ -29769,7 +30244,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}" \
@@ -29795,7 +30270,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}" \
@@ -29821,7 +30296,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}" \
@@ -29847,7 +30322,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}" \
@@ -29874,7 +30349,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}" \
@@ -29901,7 +30376,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}" \
@@ -29928,7 +30403,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}" \
@@ -29954,7 +30429,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}" \
@@ -29979,7 +30454,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}" \
@@ -30004,7 +30479,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}" \
@@ -30029,7 +30504,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}" \
@@ -30054,7 +30529,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}" \
@@ -30079,7 +30554,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; \
@@ -30131,7 +30606,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)
  
@@ -30184,7 +30659,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}" \
@@ -30210,7 +30685,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}" \
@@ -30236,7 +30711,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}" \
@@ -30262,7 +30737,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}" \
@@ -30288,7 +30763,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}" \
@@ -30315,7 +30790,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}" \
@@ -30342,7 +30817,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}" \
@@ -30369,7 +30844,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}" \
@@ -30395,7 +30870,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}" \
@@ -30420,7 +30895,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}" \
@@ -30445,7 +30920,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}" \
@@ -30470,7 +30945,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}" \
@@ -30495,7 +30970,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}" \
@@ -30519,7 +30994,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; \
@@ -30554,8 +31029,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) ;; \
@@ -30588,8 +31063,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) ;; \
@@ -30601,7 +31076,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
@@ -30622,8 +31097,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) ;; \
@@ -30635,7 +31110,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
@@ -30656,8 +31131,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) ;; \
@@ -30669,7 +31144,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
@@ -30690,8 +31165,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) ;; \
@@ -30703,7 +31178,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
@@ -30724,8 +31199,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) ;; \
@@ -30737,7 +31212,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
@@ -31024,9 +31499,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
  
@@ -31076,7 +31551,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}" \
@@ -31101,7 +31576,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}" \
@@ -31126,7 +31601,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}" \
@@ -31151,7 +31626,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}" \
@@ -31176,7 +31651,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}" \
@@ -31202,7 +31677,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}" \
@@ -31228,7 +31703,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}" \
@@ -31254,7 +31729,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}" \
@@ -31279,7 +31754,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}" \
@@ -31303,7 +31778,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}" \
@@ -31327,7 +31802,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}" \
@@ -31351,7 +31826,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}" \
@@ -31375,7 +31850,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}" \
@@ -31400,7 +31875,7 @@ configure-libcc1:
         @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; \
@@ -31452,7 +31927,7 @@ check-libcc1:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/libcc1 && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
  
@@ -31505,7 +31980,7 @@ info-libcc1: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in libcc1" ; \
+       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}" \
@@ -31531,7 +32006,7 @@ dvi-libcc1: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in libcc1" ; \
+       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}" \
@@ -31557,7 +32032,7 @@ pdf-libcc1: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in libcc1" ; \
+       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}" \
@@ -31583,7 +32058,7 @@ html-libcc1: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in libcc1" ; \
+       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}" \
@@ -31609,7 +32084,7 @@ TAGS-libcc1: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in libcc1" ; \
+       echo "Doing TAGS in libcc1"; \
         (cd $(HOST_SUBDIR)/libcc1 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -31636,7 +32111,7 @@ install-info-libcc1: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in libcc1" ; \
+       echo "Doing install-info in libcc1"; \
         (cd $(HOST_SUBDIR)/libcc1 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -31663,7 +32138,7 @@ install-pdf-libcc1: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in libcc1" ; \
+       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}" \
@@ -31690,7 +32165,7 @@ install-html-libcc1: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in libcc1" ; \
+       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}" \
@@ -31716,7 +32191,7 @@ installcheck-libcc1: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in libcc1" ; \
+       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}" \
@@ -31741,7 +32216,7 @@ mostlyclean-libcc1:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in libcc1" ; \
+       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}" \
@@ -31766,7 +32241,7 @@ clean-libcc1:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in libcc1" ; \
+       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}" \
@@ -31791,7 +32266,7 @@ distclean-libcc1:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in libcc1" ; \
+       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}" \
@@ -31816,7 +32291,7 @@ maintainer-clean-libcc1:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in libcc1" ; \
+       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}" \
@@ -31829,6 +32304,447 @@ maintainer-clean-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
  # ---------------------------------------
@@ -31847,8 +32763,8 @@ 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 ; \
+       $(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; \
@@ -31860,7 +32776,7 @@ configure-target-libstdc++-v3:
           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 ; \
+       $(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; \
@@ -31892,7 +32808,7 @@ configure-stage1-target-libstdc++-v3:
         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 ; \
+       $(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; \
@@ -31908,8 +32824,8 @@ configure-stage1-target-libstdc++-v3:
         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 ; \
+       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) ;; \
@@ -31936,7 +32852,7 @@ configure-stage2-target-libstdc++-v3:
         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 ; \
+       $(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; \
@@ -31953,8 +32869,8 @@ configure-stage2-target-libstdc++-v3:
         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 ; \
+       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) ;; \
@@ -31966,7 +32882,7 @@ configure-stage2-target-libstdc++-v3:
           --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
  
@@ -31981,7 +32897,7 @@ configure-stage3-target-libstdc++-v3:
         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 ; \
+       $(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; \
@@ -31998,8 +32914,8 @@ configure-stage3-target-libstdc++-v3:
         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 ; \
+       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) ;; \
@@ -32011,7 +32927,7 @@ configure-stage3-target-libstdc++-v3:
           --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
  
@@ -32026,7 +32942,7 @@ configure-stage4-target-libstdc++-v3:
         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 ; \
+       $(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; \
@@ -32043,8 +32959,8 @@ configure-stage4-target-libstdc++-v3:
         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 ; \
+       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) ;; \
@@ -32056,7 +32972,7 @@ configure-stage4-target-libstdc++-v3:
           --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
  
@@ -32071,7 +32987,7 @@ configure-stageprofile-target-libstdc++-v3:
         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 ; \
+       $(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; \
@@ -32088,8 +33004,8 @@ configure-stageprofile-target-libstdc++-v3:
         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 ; \
+       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) ;; \
@@ -32101,7 +33017,7 @@ configure-stageprofile-target-libstdc++-v3:
           --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
  
@@ -32116,7 +33032,7 @@ configure-stagefeedback-target-libstdc++-v3:
         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 ; \
+       $(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; \
@@ -32133,8 +33049,8 @@ configure-stagefeedback-target-libstdc++-v3:
         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 ; \
+       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) ;; \
@@ -32146,7 +33062,7 @@ configure-stagefeedback-target-libstdc++-v3:
           --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
  
@@ -32479,11 +33395,11 @@ maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
  info-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32505,11 +33421,11 @@ maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
  dvi-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32531,11 +33447,11 @@ maybe-pdf-target-libstdc++-v3: pdf-target-libstdc++-v3
  pdf-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32557,11 +33473,11 @@ maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
  html-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32583,11 +33499,11 @@ maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
  TAGS-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32610,11 +33526,11 @@ install-info-target-libstdc++-v3: \
      configure-target-libstdc++-v3 \
      info-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32637,11 +33553,11 @@ install-pdf-target-libstdc++-v3: \
      configure-target-libstdc++-v3 \
      pdf-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32664,11 +33580,11 @@ install-html-target-libstdc++-v3: \
      configure-target-libstdc++-v3 \
      html-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32690,11 +33606,11 @@ maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
  installcheck-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32715,11 +33631,11 @@ maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
  
  mostlyclean-target-libstdc++-v3: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32740,11 +33656,11 @@ maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
  
  clean-target-libstdc++-v3: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32765,11 +33681,11 @@ maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
  
  distclean-target-libstdc++-v3: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32790,11 +33706,11 @@ maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
  
  maintainer-clean-target-libstdc++-v3: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       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; \
@@ -32823,8 +33739,8 @@ configure-target-libsanitizer:
         @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 ; \
+       $(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; \
@@ -32836,7 +33752,7 @@ configure-target-libsanitizer:
           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
         fi; \
         test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
         $(RAW_CXX_TARGET_EXPORTS)  \
         echo Configuring in $(TARGET_SUBDIR)/libsanitizer; \
         cd "$(TARGET_SUBDIR)/libsanitizer" || exit 1; \
@@ -32868,7 +33784,7 @@ configure-stage1-target-libsanitizer:
         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 ; \
+       $(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; \
@@ -32884,8 +33800,8 @@ configure-stage1-target-libsanitizer:
         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 ; \
+       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) ;; \
@@ -32912,7 +33828,7 @@ configure-stage2-target-libsanitizer:
         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 ; \
+       $(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; \
@@ -32929,8 +33845,8 @@ configure-stage2-target-libsanitizer:
         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 ; \
+       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) ;; \
@@ -32942,7 +33858,7 @@ configure-stage2-target-libsanitizer:
           --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
  
@@ -32957,7 +33873,7 @@ configure-stage3-target-libsanitizer:
         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 ; \
+       $(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; \
@@ -32974,8 +33890,8 @@ configure-stage3-target-libsanitizer:
         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 ; \
+       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) ;; \
@@ -32987,7 +33903,7 @@ configure-stage3-target-libsanitizer:
           --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
  
@@ -33002,7 +33918,7 @@ configure-stage4-target-libsanitizer:
         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 ; \
+       $(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; \
@@ -33019,8 +33935,8 @@ configure-stage4-target-libsanitizer:
         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 ; \
+       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) ;; \
@@ -33032,7 +33948,7 @@ configure-stage4-target-libsanitizer:
           --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
  
@@ -33047,7 +33963,7 @@ configure-stageprofile-target-libsanitizer:
         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 ; \
+       $(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; \
@@ -33064,8 +33980,8 @@ configure-stageprofile-target-libsanitizer:
         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 ; \
+       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) ;; \
@@ -33077,7 +33993,7 @@ configure-stageprofile-target-libsanitizer:
           --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
  
@@ -33092,7 +34008,7 @@ configure-stagefeedback-target-libsanitizer:
         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 ; \
+       $(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; \
@@ -33109,8 +34025,8 @@ configure-stagefeedback-target-libsanitizer:
         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 ; \
+       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) ;; \
@@ -33122,7 +34038,7 @@ configure-stagefeedback-target-libsanitizer:
           --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
  
@@ -33455,11 +34371,11 @@ maybe-info-target-libsanitizer: info-target-libsanitizer
  info-target-libsanitizer: \
      configure-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33481,11 +34397,11 @@ maybe-dvi-target-libsanitizer: dvi-target-libsanitizer
  dvi-target-libsanitizer: \
      configure-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33507,11 +34423,11 @@ maybe-pdf-target-libsanitizer: pdf-target-libsanitizer
  pdf-target-libsanitizer: \
      configure-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33533,11 +34449,11 @@ maybe-html-target-libsanitizer: html-target-libsanitizer
  html-target-libsanitizer: \
      configure-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33559,11 +34475,11 @@ maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer
  TAGS-target-libsanitizer: \
      configure-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33586,11 +34502,11 @@ install-info-target-libsanitizer: \
      configure-target-libsanitizer \
      info-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33613,11 +34529,11 @@ install-pdf-target-libsanitizer: \
      configure-target-libsanitizer \
      pdf-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33640,11 +34556,11 @@ install-html-target-libsanitizer: \
      configure-target-libsanitizer \
      html-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33666,11 +34582,11 @@ maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer
  installcheck-target-libsanitizer: \
      configure-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33691,11 +34607,11 @@ maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer
  
  mostlyclean-target-libsanitizer: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33716,11 +34632,11 @@ maybe-clean-target-libsanitizer: clean-target-libsanitizer
  
  clean-target-libsanitizer: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33741,11 +34657,11 @@ maybe-distclean-target-libsanitizer: distclean-target-libsanitizer
  
  distclean-target-libsanitizer: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33766,11 +34682,11 @@ maybe-maintainer-clean-target-libsanitizer: maintainer-clean-target-libsanitizer
  
  maintainer-clean-target-libsanitizer: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libsanitizer/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)/libsanitizer" ; \
+       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; \
@@ -33788,6 +34704,982 @@ maintainer-clean-target-libsanitizer:
  
  
  
+.PHONY: configure-target-libmpx maybe-configure-target-libmpx
+maybe-configure-target-libmpx:
+@if gcc-bootstrap
+configure-target-libmpx: stage_current
+@endif gcc-bootstrap
+@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 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)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libmpx; \
+       cd "$(TARGET_SUBDIR)/libmpx" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libmpx; \
+       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-libmpx
+
+
+
+.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)/libmpx
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       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)/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)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       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-libmpx-bootstrap
+
+.PHONY: configure-stage2-target-libmpx maybe-configure-stage2-target-libmpx
+maybe-configure-stage2-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stage2-target-libmpx: configure-stage2-target-libmpx
+configure-stage2-target-libmpx:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(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 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)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       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)/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)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       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) \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif target-libmpx-bootstrap
+
+.PHONY: configure-stage3-target-libmpx maybe-configure-stage3-target-libmpx
+maybe-configure-stage3-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stage3-target-libmpx: configure-stage3-target-libmpx
+configure-stage3-target-libmpx:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(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 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)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       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)/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)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       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) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif target-libmpx-bootstrap
+
+.PHONY: configure-stage4-target-libmpx maybe-configure-stage4-target-libmpx
+maybe-configure-stage4-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stage4-target-libmpx: configure-stage4-target-libmpx
+configure-stage4-target-libmpx:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(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 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)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       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)/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)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       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) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif target-libmpx-bootstrap
+
+.PHONY: configure-stageprofile-target-libmpx maybe-configure-stageprofile-target-libmpx
+maybe-configure-stageprofile-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stageprofile-target-libmpx: configure-stageprofile-target-libmpx
+configure-stageprofile-target-libmpx:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(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 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)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       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)/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)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       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) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif target-libmpx-bootstrap
+
+.PHONY: configure-stagefeedback-target-libmpx maybe-configure-stagefeedback-target-libmpx
+maybe-configure-stagefeedback-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx
+configure-stagefeedback-target-libmpx:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(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 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)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       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)/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)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       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) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif target-libmpx-bootstrap
+
+
+
+
+
+.PHONY: all-target-libmpx maybe-all-target-libmpx
+maybe-all-target-libmpx:
+@if gcc-bootstrap
+all-target-libmpx: stage_current
+@endif gcc-bootstrap
+@if target-libmpx
+TARGET-target-libmpx=all
+maybe-all-target-libmpx: all-target-libmpx
+all-target-libmpx: configure-target-libmpx
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libmpx))
+@endif target-libmpx
+
+
+
+.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)"; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(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)  \
+                 \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-target-libmpx)
+
+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)/libmpx/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage1-libmpx/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
+         clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stage2-target-libmpx maybe-all-stage2-target-libmpx
+.PHONY: clean-stage2-target-libmpx maybe-clean-stage2-target-libmpx
+maybe-all-stage2-target-libmpx:
+maybe-clean-stage2-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stage2-target-libmpx: all-stage2-target-libmpx
+all-stage2: all-stage2-target-libmpx
+TARGET-stage2-target-libmpx = $(TARGET-target-libmpx)
+all-stage2-target-libmpx: configure-stage2-target-libmpx
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(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)   \
+               TFLAGS="$(STAGE2_TFLAGS)" \
+               $(TARGET-stage2-target-libmpx)
+
+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)/libmpx/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage2-libmpx/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stage3-target-libmpx maybe-all-stage3-target-libmpx
+.PHONY: clean-stage3-target-libmpx maybe-clean-stage3-target-libmpx
+maybe-all-stage3-target-libmpx:
+maybe-clean-stage3-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stage3-target-libmpx: all-stage3-target-libmpx
+all-stage3: all-stage3-target-libmpx
+TARGET-stage3-target-libmpx = $(TARGET-target-libmpx)
+all-stage3-target-libmpx: configure-stage3-target-libmpx
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(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)   \
+               TFLAGS="$(STAGE3_TFLAGS)" \
+               $(TARGET-stage3-target-libmpx)
+
+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)/libmpx/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage3-libmpx/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stage4-target-libmpx maybe-all-stage4-target-libmpx
+.PHONY: clean-stage4-target-libmpx maybe-clean-stage4-target-libmpx
+maybe-all-stage4-target-libmpx:
+maybe-clean-stage4-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stage4-target-libmpx: all-stage4-target-libmpx
+all-stage4: all-stage4-target-libmpx
+TARGET-stage4-target-libmpx = $(TARGET-target-libmpx)
+all-stage4-target-libmpx: configure-stage4-target-libmpx
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(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)   \
+               TFLAGS="$(STAGE4_TFLAGS)" \
+               $(TARGET-stage4-target-libmpx)
+
+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)/libmpx/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage4-libmpx/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stageprofile-target-libmpx maybe-all-stageprofile-target-libmpx
+.PHONY: clean-stageprofile-target-libmpx maybe-clean-stageprofile-target-libmpx
+maybe-all-stageprofile-target-libmpx:
+maybe-clean-stageprofile-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stageprofile-target-libmpx: all-stageprofile-target-libmpx
+all-stageprofile: all-stageprofile-target-libmpx
+TARGET-stageprofile-target-libmpx = $(TARGET-target-libmpx)
+all-stageprofile-target-libmpx: configure-stageprofile-target-libmpx
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(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)   \
+               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               $(TARGET-stageprofile-target-libmpx)
+
+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)/libmpx/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libmpx/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libmpx maybe-all-stagefeedback-target-libmpx
+.PHONY: clean-stagefeedback-target-libmpx maybe-clean-stagefeedback-target-libmpx
+maybe-all-stagefeedback-target-libmpx:
+maybe-clean-stagefeedback-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stagefeedback-target-libmpx: all-stagefeedback-target-libmpx
+all-stagefeedback: all-stagefeedback-target-libmpx
+TARGET-stagefeedback-target-libmpx = $(TARGET-target-libmpx)
+all-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(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)   \
+               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               $(TARGET-stagefeedback-target-libmpx)
+
+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)/libmpx/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libmpx/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+
+
+
+
+.PHONY: check-target-libmpx maybe-check-target-libmpx
+maybe-check-target-libmpx:
+@if target-libmpx
+maybe-check-target-libmpx: check-target-libmpx
+
+check-target-libmpx:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libmpx
+
+.PHONY: install-target-libmpx maybe-install-target-libmpx
+maybe-install-target-libmpx:
+@if target-libmpx
+maybe-install-target-libmpx: install-target-libmpx
+
+install-target-libmpx: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libmpx
+
+.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-libmpx: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libmpx
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libmpx info-target-libmpx
+maybe-info-target-libmpx:
+@if target-libmpx
+maybe-info-target-libmpx: info-target-libmpx
+
+info-target-libmpx: \
+    configure-target-libmpx 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+.PHONY: maybe-dvi-target-libmpx dvi-target-libmpx
+maybe-dvi-target-libmpx:
+@if target-libmpx
+maybe-dvi-target-libmpx: dvi-target-libmpx
+
+dvi-target-libmpx: \
+    configure-target-libmpx 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+.PHONY: maybe-pdf-target-libmpx pdf-target-libmpx
+maybe-pdf-target-libmpx:
+@if target-libmpx
+maybe-pdf-target-libmpx: pdf-target-libmpx
+
+pdf-target-libmpx: \
+    configure-target-libmpx 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+.PHONY: maybe-html-target-libmpx html-target-libmpx
+maybe-html-target-libmpx:
+@if target-libmpx
+maybe-html-target-libmpx: html-target-libmpx
+
+html-target-libmpx: \
+    configure-target-libmpx 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+.PHONY: maybe-TAGS-target-libmpx TAGS-target-libmpx
+maybe-TAGS-target-libmpx:
+@if target-libmpx
+maybe-TAGS-target-libmpx: TAGS-target-libmpx
+
+TAGS-target-libmpx: \
+    configure-target-libmpx 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+.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-libmpx: \
+    configure-target-libmpx \
+    info-target-libmpx 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+.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-libmpx: \
+    configure-target-libmpx \
+    pdf-target-libmpx 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+.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-libmpx: \
+    configure-target-libmpx \
+    html-target-libmpx 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+.PHONY: maybe-installcheck-target-libmpx installcheck-target-libmpx
+maybe-installcheck-target-libmpx:
+@if target-libmpx
+maybe-installcheck-target-libmpx: installcheck-target-libmpx
+
+installcheck-target-libmpx: \
+    configure-target-libmpx 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+.PHONY: maybe-mostlyclean-target-libmpx mostlyclean-target-libmpx
+maybe-mostlyclean-target-libmpx:
+@if target-libmpx
+maybe-mostlyclean-target-libmpx: mostlyclean-target-libmpx
+
+mostlyclean-target-libmpx: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+.PHONY: maybe-clean-target-libmpx clean-target-libmpx
+maybe-clean-target-libmpx:
+@if target-libmpx
+maybe-clean-target-libmpx: clean-target-libmpx
+
+clean-target-libmpx: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+.PHONY: maybe-distclean-target-libmpx distclean-target-libmpx
+maybe-distclean-target-libmpx:
+@if target-libmpx
+maybe-distclean-target-libmpx: distclean-target-libmpx
+
+distclean-target-libmpx: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+.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-libmpx: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmpx"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(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-libmpx
+
+
+
+
+
  .PHONY: configure-target-libvtv maybe-configure-target-libvtv
  maybe-configure-target-libvtv:
  @if gcc-bootstrap
@@ -33799,8 +35691,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; \
@@ -33812,7 +35704,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; \
@@ -33844,7 +35736,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; \
@@ -33860,8 +35752,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) ;; \
@@ -33888,7 +35780,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; \
@@ -33905,8 +35797,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) ;; \
@@ -33918,7 +35810,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
  
@@ -33933,7 +35825,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; \
@@ -33950,8 +35842,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) ;; \
@@ -33963,7 +35855,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
  
@@ -33978,7 +35870,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; \
@@ -33995,8 +35887,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) ;; \
@@ -34008,7 +35900,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
  
@@ -34023,7 +35915,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; \
@@ -34040,8 +35932,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) ;; \
@@ -34053,7 +35945,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
  
@@ -34068,7 +35960,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; \
@@ -34085,8 +35977,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) ;; \
@@ -34098,7 +35990,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
  
@@ -34431,11 +36323,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; \
@@ -34457,11 +36349,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; \
@@ -34483,11 +36375,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; \
@@ -34509,11 +36401,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; \
@@ -34535,11 +36427,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; \
@@ -34562,11 +36454,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; \
@@ -34589,11 +36481,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; \
@@ -34616,11 +36508,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; \
@@ -34642,11 +36534,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; \
@@ -34667,11 +36559,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; \
@@ -34692,11 +36584,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; \
@@ -34717,11 +36609,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; \
@@ -34742,11 +36634,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; \
@@ -34776,8 +36668,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; \
@@ -34789,7 +36681,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; \
@@ -34889,11 +36781,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; \
@@ -34915,11 +36807,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; \
@@ -34941,11 +36833,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; \
@@ -34967,11 +36859,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; \
@@ -34993,11 +36885,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; \
@@ -35020,11 +36912,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; \
@@ -35047,11 +36939,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; \
@@ -35074,11 +36966,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; \
@@ -35100,11 +36992,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; \
@@ -35125,11 +37017,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; \
@@ -35150,11 +37042,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; \
@@ -35175,11 +37067,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; \
@@ -35200,11 +37092,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; \
@@ -35234,8 +37126,8 @@ configure-target-liboffloadmic:
         @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 ; \
+       $(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; \
@@ -35247,7 +37139,7 @@ configure-target-liboffloadmic:
           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 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/liboffloadmic; \
         $(NORMAL_TARGET_EXPORTS)  \
         echo Configuring in $(TARGET_SUBDIR)/liboffloadmic; \
         cd "$(TARGET_SUBDIR)/liboffloadmic" || exit 1; \
@@ -35347,11 +37239,11 @@ maybe-info-target-liboffloadmic: info-target-liboffloadmic
  info-target-liboffloadmic: \
      configure-target-liboffloadmic 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35373,11 +37265,11 @@ maybe-dvi-target-liboffloadmic: dvi-target-liboffloadmic
  dvi-target-liboffloadmic: \
      configure-target-liboffloadmic 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35399,11 +37291,11 @@ maybe-pdf-target-liboffloadmic: pdf-target-liboffloadmic
  pdf-target-liboffloadmic: \
      configure-target-liboffloadmic 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35425,11 +37317,11 @@ maybe-html-target-liboffloadmic: html-target-liboffloadmic
  html-target-liboffloadmic: \
      configure-target-liboffloadmic 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35451,11 +37343,11 @@ maybe-TAGS-target-liboffloadmic: TAGS-target-liboffloadmic
  TAGS-target-liboffloadmic: \
      configure-target-liboffloadmic 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35478,11 +37370,11 @@ install-info-target-liboffloadmic: \
      configure-target-liboffloadmic \
      info-target-liboffloadmic 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35505,11 +37397,11 @@ install-pdf-target-liboffloadmic: \
      configure-target-liboffloadmic \
      pdf-target-liboffloadmic 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35532,11 +37424,11 @@ install-html-target-liboffloadmic: \
      configure-target-liboffloadmic \
      html-target-liboffloadmic 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35558,11 +37450,11 @@ maybe-installcheck-target-liboffloadmic: installcheck-target-liboffloadmic
  installcheck-target-liboffloadmic: \
      configure-target-liboffloadmic 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35583,11 +37475,11 @@ maybe-mostlyclean-target-liboffloadmic: mostlyclean-target-liboffloadmic
  
  mostlyclean-target-liboffloadmic: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35608,11 +37500,11 @@ maybe-clean-target-liboffloadmic: clean-target-liboffloadmic
  
  clean-target-liboffloadmic: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35633,11 +37525,11 @@ maybe-distclean-target-liboffloadmic: distclean-target-liboffloadmic
  
  distclean-target-liboffloadmic: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35658,11 +37550,11 @@ maybe-maintainer-clean-target-liboffloadmic: maintainer-clean-target-liboffloadm
  
  maintainer-clean-target-liboffloadmic: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0 ; \
+       @[ -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" ; \
+       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; \
@@ -35692,8 +37584,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; \
@@ -35705,7 +37597,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; \
@@ -35805,11 +37697,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; \
@@ -35831,11 +37723,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; \
@@ -35857,11 +37749,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; \
@@ -35883,11 +37775,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; \
@@ -35909,11 +37801,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; \
@@ -35936,11 +37828,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; \
@@ -35963,11 +37855,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; \
@@ -35990,11 +37882,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; \
@@ -36016,11 +37908,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; \
@@ -36041,11 +37933,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; \
@@ -36066,11 +37958,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; \
@@ -36091,11 +37983,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; \
@@ -36116,11 +38008,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; \
@@ -36150,8 +38042,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; \
@@ -36163,7 +38055,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; \
@@ -36263,11 +38155,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; \
@@ -36289,11 +38181,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; \
@@ -36315,11 +38207,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; \
@@ -36341,11 +38233,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; \
@@ -36367,11 +38259,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; \
@@ -36394,11 +38286,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; \
@@ -36421,11 +38313,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; \
@@ -36448,11 +38340,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; \
@@ -36474,11 +38366,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; \
@@ -36499,11 +38391,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; \
@@ -36524,11 +38416,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; \
@@ -36549,11 +38441,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; \
@@ -36574,11 +38466,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; \
@@ -36607,8 +38499,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; \
@@ -36620,7 +38512,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; \
@@ -36652,7 +38544,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; \
@@ -36668,8 +38560,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) ;; \
@@ -36696,7 +38588,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; \
@@ -36713,8 +38605,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) ;; \
@@ -36726,7 +38618,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
  
@@ -36741,7 +38633,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; \
@@ -36758,8 +38650,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) ;; \
@@ -36771,7 +38663,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
  
@@ -36786,7 +38678,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; \
@@ -36803,8 +38695,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) ;; \
@@ -36816,7 +38708,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
  
@@ -36831,7 +38723,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; \
@@ -36848,8 +38740,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) ;; \
@@ -36861,7 +38753,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
  
@@ -36876,7 +38768,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; \
@@ -36893,8 +38785,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) ;; \
@@ -36906,7 +38798,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
  
@@ -37234,11 +39126,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; \
@@ -37260,11 +39152,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; \
@@ -37286,11 +39178,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; \
@@ -37312,11 +39204,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; \
@@ -37338,11 +39230,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; \
@@ -37365,11 +39257,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; \
@@ -37392,11 +39284,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; \
@@ -37419,11 +39311,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; \
@@ -37445,11 +39337,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; \
@@ -37470,11 +39362,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; \
@@ -37495,11 +39387,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; \
@@ -37520,11 +39412,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; \
@@ -37545,11 +39437,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; \
@@ -37579,8 +39471,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; \
@@ -37592,7 +39484,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; \
@@ -37692,11 +39584,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; \
@@ -37718,11 +39610,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; \
@@ -37744,11 +39636,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; \
@@ -37770,11 +39662,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; \
@@ -37796,11 +39688,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; \
@@ -37823,11 +39715,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; \
@@ -37850,11 +39742,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; \
@@ -37877,11 +39769,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; \
@@ -37903,11 +39795,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; \
@@ -37928,11 +39820,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; \
@@ -37953,11 +39845,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; \
@@ -37978,11 +39870,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; \
@@ -38003,11 +39895,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; \
@@ -38037,8 +39929,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; \
@@ -38050,7 +39942,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; \
@@ -38150,11 +40042,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; \
@@ -38176,11 +40068,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; \
@@ -38202,11 +40094,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; \
@@ -38228,11 +40120,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; \
@@ -38254,11 +40146,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; \
@@ -38281,11 +40173,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; \
@@ -38308,11 +40200,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; \
@@ -38335,11 +40227,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; \
@@ -38361,11 +40253,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; \
@@ -38386,11 +40278,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; \
@@ -38411,11 +40303,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; \
@@ -38436,11 +40328,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; \
@@ -38461,11 +40353,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; \
@@ -38495,8 +40387,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; \
@@ -38508,7 +40400,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; \
@@ -38608,11 +40500,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; \
@@ -38634,11 +40526,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; \
@@ -38660,11 +40552,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; \
@@ -38686,11 +40578,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; \
@@ -38712,11 +40604,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; \
@@ -38739,11 +40631,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; \
@@ -38766,11 +40658,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; \
@@ -38793,11 +40685,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; \
@@ -38819,11 +40711,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; \
@@ -38844,11 +40736,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; \
@@ -38869,11 +40761,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; \
@@ -38894,11 +40786,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; \
@@ -38919,11 +40811,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; \
@@ -38953,8 +40845,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; \
@@ -38966,7 +40858,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; \
@@ -39066,11 +40958,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; \
@@ -39092,11 +40984,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; \
@@ -39118,11 +41010,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; \
@@ -39144,11 +41036,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; \
@@ -39170,11 +41062,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; \
@@ -39197,11 +41089,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; \
@@ -39224,11 +41116,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; \
@@ -39251,11 +41143,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; \
@@ -39277,11 +41169,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; \
@@ -39302,11 +41194,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; \
@@ -39327,11 +41219,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; \
@@ -39352,11 +41244,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; \
@@ -39377,11 +41269,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; \
@@ -39411,8 +41303,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; \
@@ -39424,7 +41316,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; \
@@ -39524,11 +41416,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; \
@@ -39550,11 +41442,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; \
@@ -39576,11 +41468,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; \
@@ -39602,11 +41494,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; \
@@ -39628,11 +41520,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; \
@@ -39655,11 +41547,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; \
@@ -39682,11 +41574,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; \
@@ -39709,11 +41601,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; \
@@ -39735,11 +41627,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; \
@@ -39760,11 +41652,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; \
@@ -39785,11 +41677,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; \
@@ -39810,11 +41702,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; \
@@ -39835,11 +41727,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; \
@@ -39869,8 +41761,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; \
@@ -39882,7 +41774,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; \
@@ -39977,11 +41869,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; \
@@ -40003,11 +41895,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; \
@@ -40029,11 +41921,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; \
@@ -40055,11 +41947,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; \
@@ -40081,11 +41973,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; \
@@ -40108,11 +42000,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; \
@@ -40135,11 +42027,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; \
@@ -40162,11 +42054,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; \
@@ -40188,11 +42080,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; \
@@ -40262,8 +42154,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; \
@@ -40275,7 +42167,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; \
@@ -40375,11 +42267,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; \
@@ -40401,11 +42293,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; \
@@ -40427,11 +42319,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; \
@@ -40453,11 +42345,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; \
@@ -40479,11 +42371,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; \
@@ -40506,11 +42398,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; \
@@ -40533,11 +42425,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; \
@@ -40560,11 +42452,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; \
@@ -40586,11 +42478,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; \
@@ -40611,11 +42503,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; \
@@ -40636,11 +42528,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; \
@@ -40661,11 +42553,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; \
@@ -40686,11 +42578,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; \
@@ -40720,8 +42612,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; \
@@ -40733,7 +42625,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; \
@@ -40828,11 +42720,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; \
@@ -40854,11 +42746,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; \
@@ -40880,11 +42772,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; \
@@ -40906,11 +42798,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; \
@@ -40932,11 +42824,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; \
@@ -40959,11 +42851,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; \
@@ -40986,11 +42878,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; \
@@ -41013,11 +42905,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; \
@@ -41039,11 +42931,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; \
@@ -41064,11 +42956,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; \
@@ -41089,11 +42981,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; \
@@ -41114,11 +43006,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; \
@@ -41139,11 +43031,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; \
@@ -41173,8 +43065,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; \
@@ -41186,7 +43078,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; \
@@ -41276,11 +43168,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; \
@@ -41302,11 +43194,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; \
@@ -41328,11 +43220,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; \
@@ -41354,11 +43246,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; \
@@ -41380,11 +43272,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; \
@@ -41407,11 +43299,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; \
@@ -41434,11 +43326,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; \
@@ -41461,11 +43353,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; \
@@ -41487,11 +43379,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; \
@@ -41512,11 +43404,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; \
@@ -41537,11 +43429,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; \
@@ -41562,11 +43454,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; \
@@ -41587,11 +43479,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; \
@@ -41621,8 +43513,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; \
@@ -41634,7 +43526,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; \
@@ -41734,11 +43626,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; \
@@ -41760,11 +43652,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; \
@@ -41786,11 +43678,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; \
@@ -41812,11 +43704,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; \
@@ -41838,11 +43730,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; \
@@ -41865,11 +43757,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; \
@@ -41892,11 +43784,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; \
@@ -41919,11 +43811,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; \
@@ -41945,11 +43837,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; \
@@ -41970,11 +43862,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; \
@@ -41995,11 +43887,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; \
@@ -42020,11 +43912,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; \
@@ -42045,11 +43937,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; \
@@ -42079,8 +43971,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; \
@@ -42092,7 +43984,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; \
@@ -42192,11 +44084,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; \
@@ -42218,11 +44110,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; \
@@ -42244,11 +44136,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; \
@@ -42270,11 +44162,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; \
@@ -42296,11 +44188,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; \
@@ -42323,11 +44215,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; \
@@ -42350,11 +44242,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; \
@@ -42377,11 +44269,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; \
@@ -42403,11 +44295,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; \
@@ -42428,11 +44320,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; \
@@ -42453,11 +44345,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; \
@@ -42478,11 +44370,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; \
@@ -42503,11 +44395,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; \
@@ -42537,8 +44429,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; \
@@ -42550,7 +44442,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; \
@@ -42650,11 +44542,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; \
@@ -42676,11 +44568,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; \
@@ -42702,11 +44594,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; \
@@ -42728,11 +44620,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; \
@@ -42754,11 +44646,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; \
@@ -42781,11 +44673,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; \
@@ -42808,11 +44700,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; \
@@ -42835,11 +44727,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; \
@@ -42861,11 +44753,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; \
@@ -42886,11 +44778,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; \
@@ -42911,11 +44803,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; \
@@ -42936,11 +44828,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; \
@@ -42961,11 +44853,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; \
@@ -42995,8 +44887,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; \
@@ -43008,7 +44900,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; \
@@ -43108,11 +45000,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; \
@@ -43134,11 +45026,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; \
@@ -43160,11 +45052,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; \
@@ -43186,11 +45078,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; \
@@ -43212,11 +45104,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; \
@@ -43239,11 +45131,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; \
@@ -43266,11 +45158,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; \
@@ -43293,11 +45185,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; \
@@ -43319,11 +45211,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; \
@@ -43344,11 +45236,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; \
@@ -43369,11 +45261,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; \
@@ -43394,11 +45286,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; \
@@ -43419,11 +45311,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; \
@@ -43453,8 +45345,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; \
@@ -43466,7 +45358,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; \
@@ -43566,11 +45458,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; \
@@ -43592,11 +45484,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; \
@@ -43618,11 +45510,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; \
@@ -43644,11 +45536,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; \
@@ -43670,11 +45562,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; \
@@ -43697,11 +45589,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; \
@@ -43724,11 +45616,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; \
@@ -43751,11 +45643,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; \
@@ -43777,11 +45669,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; \
@@ -43802,11 +45694,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; \
@@ -43827,11 +45719,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; \
@@ -43852,11 +45744,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; \
@@ -43877,11 +45769,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; \
@@ -43910,8 +45802,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; \
@@ -43923,7 +45815,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; \
@@ -43955,7 +45847,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; \
@@ -43971,8 +45863,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) ;; \
@@ -43999,7 +45891,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; \
@@ -44016,8 +45908,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) ;; \
@@ -44029,7 +45921,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
  
@@ -44044,7 +45936,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; \
@@ -44061,8 +45953,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) ;; \
@@ -44074,7 +45966,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
  
@@ -44089,7 +45981,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; \
@@ -44106,8 +45998,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) ;; \
@@ -44119,7 +46011,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
  
@@ -44134,7 +46026,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; \
@@ -44151,8 +46043,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) ;; \
@@ -44164,7 +46056,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
  
@@ -44179,7 +46071,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; \
@@ -44196,8 +46088,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) ;; \
@@ -44209,7 +46101,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
  
@@ -44542,11 +46434,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; \
@@ -44568,11 +46460,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; \
@@ -44594,11 +46486,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; \
@@ -44620,11 +46512,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; \
@@ -44646,11 +46538,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; \
@@ -44673,11 +46565,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; \
@@ -44700,11 +46592,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; \
@@ -44727,11 +46619,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; \
@@ -44753,11 +46645,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; \
@@ -44778,11 +46670,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; \
@@ -44803,11 +46695,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; \
@@ -44828,11 +46720,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; \
@@ -44853,11 +46745,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; \
@@ -44887,8 +46779,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; \
@@ -44900,7 +46792,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; \
@@ -45000,11 +46892,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; \
@@ -45026,11 +46918,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; \
@@ -45052,11 +46944,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; \
@@ -45078,11 +46970,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; \
@@ -45104,11 +46996,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; \
@@ -45131,11 +47023,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; \
@@ -45158,11 +47050,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; \
@@ -45185,11 +47077,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; \
@@ -45211,11 +47103,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; \
@@ -45236,11 +47128,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; \
@@ -45261,11 +47153,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; \
@@ -45286,11 +47178,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; \
@@ -45311,11 +47203,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; \
@@ -45345,8 +47237,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; \
@@ -45358,7 +47250,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; \
@@ -45458,11 +47350,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; \
@@ -45484,11 +47376,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; \
@@ -45510,11 +47402,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; \
@@ -45536,11 +47428,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; \
@@ -45562,11 +47454,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; \
@@ -45589,11 +47481,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; \
@@ -45616,11 +47508,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; \
@@ -45643,11 +47535,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; \
@@ -45669,11 +47561,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; \
@@ -45694,11 +47586,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; \
@@ -45719,11 +47611,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; \
@@ -45744,11 +47636,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; \
@@ -45769,11 +47661,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; \
@@ -45816,7 +47708,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
@@ -45956,226 +47848,236 @@ 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 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
         @[ -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 libelf
-       @if test -d $(HOST_SUBDIR)/libelf ; then \
-         cd $(HOST_SUBDIR); mv libelf stage1-libelf  ; \
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stage1-libelf; \
         fi
  @endif libelf
  @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stage1-gold  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stage1-gold; \
         fi
  @endif gold
  @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stage1-intl  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stage1-intl; \
         fi
  @endif intl
  @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stage1-ld  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stage1-ld; \
         fi
  @endif ld
  @if libbacktrace
-       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
-         cd $(HOST_SUBDIR); mv libbacktrace stage1-libbacktrace  ; \
+       @if test -d $(HOST_SUBDIR)/libbacktrace; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stage1-libbacktrace; \
         fi
  @endif libbacktrace
  @if libcpp
-       @if test -d $(HOST_SUBDIR)/libcpp ; then \
-         cd $(HOST_SUBDIR); mv libcpp stage1-libcpp  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stage1-libcpp; \
         fi
  @endif libcpp
  @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber; \
         fi
  @endif libdecnumber
  @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stage1-libiberty  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stage1-libiberty; \
         fi
  @endif libiberty
  @if libiberty-linker-plugin
-       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin ; then \
-         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage1-libiberty-linker-plugin  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage1-libiberty-linker-plugin; \
         fi
  @endif libiberty-linker-plugin
+@if 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 stage1-zlib  ; \
+       @if test -d $(HOST_SUBDIR)/zlib; then \
+         cd $(HOST_SUBDIR); mv zlib stage1-zlib; \
         fi
  @endif zlib
  @if lto-plugin
-       @if test -d $(HOST_SUBDIR)/lto-plugin ; then \
-         cd $(HOST_SUBDIR); mv lto-plugin stage1-lto-plugin  ; \
+       @if test -d $(HOST_SUBDIR)/lto-plugin; then \
+         cd $(HOST_SUBDIR); mv lto-plugin stage1-lto-plugin; \
         fi
  @endif lto-plugin
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR)  ; \
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); \
         fi
         rm -f stage_current
  
@@ -46186,8 +48088,8 @@ stage1-end::
  stage1-bubble:: 
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stage1-lean  ; then \
-         echo Skipping rebuild of stage1 ; \
+       if test -f stage1-lean ; then \
+         echo Skipping rebuild of stage1; \
         else \
           $(MAKE) stage1-start; \
           $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
@@ -46219,600 +48121,624 @@ distclean-stage1::
  
  stage2-start::
         @: $(MAKE); $(stage); \
-       echo stage2 > stage_current ; \
+       echo stage2 > stage_current; \
         echo stage2 > stage_last; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
           mkdir stage2-bfd; \
-       mv stage2-bfd bfd  ; \
+       mv stage2-bfd bfd; \
         mv stage1-bfd prev-bfd || test -f stage1-lean 
  @endif bfd
  @if opcodes
         @cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
           mkdir stage2-opcodes; \
-       mv stage2-opcodes opcodes  ; \
+       mv stage2-opcodes opcodes; \
         mv stage1-opcodes prev-opcodes || test -f stage1-lean 
  @endif opcodes
  @if binutils
         @cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
           mkdir stage2-binutils; \
-       mv stage2-binutils binutils  ; \
+       mv stage2-binutils binutils; \
         mv stage1-binutils prev-binutils || test -f stage1-lean 
  @endif binutils
  @if fixincludes
         @cd $(HOST_SUBDIR); [ -d stage2-fixincludes ] || \
           mkdir stage2-fixincludes; \
-       mv stage2-fixincludes fixincludes  ; \
+       mv stage2-fixincludes fixincludes; \
         mv stage1-fixincludes prev-fixincludes || test -f stage1-lean 
  @endif fixincludes
  @if gas
         @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
           mkdir stage2-gas; \
-       mv stage2-gas gas  ; \
+       mv stage2-gas gas; \
         mv stage1-gas prev-gas || test -f stage1-lean 
  @endif gas
  @if gcc
         @cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
           mkdir stage2-gcc; \
-       mv stage2-gcc gcc  ; \
+       mv stage2-gcc gcc; \
         mv stage1-gcc prev-gcc || test -f stage1-lean 
  @endif gcc
  @if gmp
         @cd $(HOST_SUBDIR); [ -d stage2-gmp ] || \
           mkdir stage2-gmp; \
-       mv stage2-gmp gmp  ; \
+       mv stage2-gmp gmp; \
         mv stage1-gmp prev-gmp || test -f stage1-lean 
  @endif gmp
  @if mpfr
         @cd $(HOST_SUBDIR); [ -d stage2-mpfr ] || \
           mkdir stage2-mpfr; \
-       mv stage2-mpfr mpfr  ; \
+       mv stage2-mpfr mpfr; \
         mv stage1-mpfr prev-mpfr || test -f stage1-lean 
  @endif mpfr
  @if mpc
         @cd $(HOST_SUBDIR); [ -d stage2-mpc ] || \
           mkdir stage2-mpc; \
-       mv stage2-mpc mpc  ; \
+       mv stage2-mpc mpc; \
         mv stage1-mpc prev-mpc || test -f stage1-lean 
  @endif mpc
  @if isl
         @cd $(HOST_SUBDIR); [ -d stage2-isl ] || \
           mkdir stage2-isl; \
-       mv stage2-isl isl  ; \
+       mv stage2-isl isl; \
         mv stage1-isl prev-isl || test -f stage1-lean 
  @endif isl
  @if libelf
         @cd $(HOST_SUBDIR); [ -d stage2-libelf ] || \
           mkdir stage2-libelf; \
-       mv stage2-libelf libelf  ; \
+       mv stage2-libelf libelf; \
         mv stage1-libelf prev-libelf || test -f stage1-lean 
  @endif libelf
  @if gold
         @cd $(HOST_SUBDIR); [ -d stage2-gold ] || \
           mkdir stage2-gold; \
-       mv stage2-gold gold  ; \
+       mv stage2-gold gold; \
         mv stage1-gold prev-gold || test -f stage1-lean 
  @endif gold
  @if intl
         @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
           mkdir stage2-intl; \
-       mv stage2-intl intl  ; \
+       mv stage2-intl intl; \
         mv stage1-intl prev-intl || test -f stage1-lean 
  @endif intl
  @if ld
         @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
           mkdir stage2-ld; \
-       mv stage2-ld ld  ; \
+       mv stage2-ld ld; \
         mv stage1-ld prev-ld || test -f stage1-lean 
  @endif ld
  @if libbacktrace
         @cd $(HOST_SUBDIR); [ -d stage2-libbacktrace ] || \
           mkdir stage2-libbacktrace; \
-       mv stage2-libbacktrace libbacktrace  ; \
+       mv stage2-libbacktrace libbacktrace; \
         mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
  @endif libbacktrace
  @if libcpp
         @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
           mkdir stage2-libcpp; \
-       mv stage2-libcpp libcpp  ; \
+       mv stage2-libcpp libcpp; \
         mv stage1-libcpp prev-libcpp || test -f stage1-lean 
  @endif libcpp
  @if libdecnumber
         @cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \
           mkdir stage2-libdecnumber; \
-       mv stage2-libdecnumber libdecnumber  ; \
+       mv stage2-libdecnumber libdecnumber; \
         mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
  @endif libdecnumber
  @if libiberty
         @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
           mkdir stage2-libiberty; \
-       mv stage2-libiberty libiberty  ; \
+       mv stage2-libiberty libiberty; \
         mv stage1-libiberty prev-libiberty || test -f stage1-lean 
  @endif libiberty
  @if libiberty-linker-plugin
         @cd $(HOST_SUBDIR); [ -d stage2-libiberty-linker-plugin ] || \
           mkdir stage2-libiberty-linker-plugin; \
-       mv stage2-libiberty-linker-plugin libiberty-linker-plugin  ; \
+       mv stage2-libiberty-linker-plugin libiberty-linker-plugin; \
         mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean 
  @endif libiberty-linker-plugin
+@if 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 stage2-zlib zlib; \
         mv stage1-zlib prev-zlib || test -f stage1-lean 
  @endif zlib
  @if lto-plugin
         @cd $(HOST_SUBDIR); [ -d stage2-lto-plugin ] || \
           mkdir stage2-lto-plugin; \
-       mv stage2-lto-plugin lto-plugin  ; \
+       mv stage2-lto-plugin lto-plugin; \
         mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
  @endif lto-plugin
         @[ -d stage2-$(TARGET_SUBDIR) ] || \
           mkdir stage2-$(TARGET_SUBDIR); \
-       mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
+       mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
         mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
  
  stage2-end:: 
  @if bfd
-       @if test -d $(HOST_SUBDIR)/bfd ; then \
-         cd $(HOST_SUBDIR); mv bfd stage2-bfd ; \
-         mv prev-bfd stage1-bfd ; :  ; \
+       @if test -d $(HOST_SUBDIR)/bfd; then \
+         cd $(HOST_SUBDIR); mv bfd stage2-bfd; \
+         mv prev-bfd stage1-bfd; : ; \
+       fi
+@endif bfd
+@if opcodes
+       @if test -d $(HOST_SUBDIR)/opcodes; then \
+         cd $(HOST_SUBDIR); mv opcodes stage2-opcodes; \
+         mv prev-opcodes stage1-opcodes; : ; \
+       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
+
+# Bubble a bug fix through all the stages up to stage 2.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured either.
+.PHONY: stage2-bubble
+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; \
+       else \
+         $(MAKE) stage2-start; \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \
+       fi
+
+.PHONY: all-stage2 clean-stage2
+do-clean: clean-stage2
+
+# 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
+
+
+
+.PHONY: bootstrap2 bootstrap2-lean
+bootstrap2:
+       echo stage2 > stage_final
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+bootstrap2-lean:
+       echo stage2 > stage_final
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage2-bubble
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage1:: distclean-stage2 
+.PHONY: distclean-stage2
+distclean-stage2::
+       @: $(MAKE); $(stage)
+       @test "`cat stage_last`" != stage2 || rm -f stage_last
+       rm -rf stage2-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage3-start stage3-end
+
+stage3-start::
+       @: $(MAKE); $(stage); \
+       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 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 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 stage2-binutils prev-binutils || test -f stage2-lean 
+@endif binutils
+@if fixincludes
+       @cd $(HOST_SUBDIR); [ -d stage3-fixincludes ] || \
+         mkdir stage3-fixincludes; \
+       mv stage3-fixincludes fixincludes; \
+       mv stage2-fixincludes prev-fixincludes || test -f stage2-lean 
+@endif fixincludes
+@if gas
+       @cd $(HOST_SUBDIR); [ -d stage3-gas ] || \
+         mkdir stage3-gas; \
+       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 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 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 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 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 stage2-isl prev-isl || test -f stage2-lean 
+@endif isl
+@if libelf
+       @cd $(HOST_SUBDIR); [ -d stage3-libelf ] || \
+         mkdir stage3-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 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 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 stage2-ld prev-ld || test -f stage2-lean 
+@endif ld
+@if libbacktrace
+       @cd $(HOST_SUBDIR); [ -d stage3-libbacktrace ] || \
+         mkdir stage3-libbacktrace; \
+       mv stage3-libbacktrace libbacktrace; \
+       mv stage2-libbacktrace prev-libbacktrace || test -f stage2-lean 
+@endif libbacktrace
+@if libcpp
+       @cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \
+         mkdir stage3-libcpp; \
+       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 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 stage2-libiberty prev-libiberty || test -f stage2-lean 
+@endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stage3-libiberty-linker-plugin ] || \
+         mkdir stage3-libiberty-linker-plugin; \
+       mv stage3-libiberty-linker-plugin libiberty-linker-plugin; \
+       mv stage2-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage2-lean 
+@endif libiberty-linker-plugin
+@if 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 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 stage2-lto-plugin prev-lto-plugin || test -f stage2-lean 
+@endif lto-plugin
+       @[ -d stage3-$(TARGET_SUBDIR) ] || \
+         mkdir stage3-$(TARGET_SUBDIR); \
+       mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
+       mv 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; : ; \
         fi
  @endif bfd
  @if opcodes
-       @if test -d $(HOST_SUBDIR)/opcodes ; then \
-         cd $(HOST_SUBDIR); mv opcodes stage2-opcodes ; \
-         mv prev-opcodes stage1-opcodes ; :  ; \
+       @if test -d $(HOST_SUBDIR)/opcodes; then \
+         cd $(HOST_SUBDIR); mv opcodes stage3-opcodes; \
+         mv prev-opcodes stage2-opcodes; : ; \
         fi
  @endif opcodes
  @if binutils
-       @if test -d $(HOST_SUBDIR)/binutils ; then \
-         cd $(HOST_SUBDIR); mv binutils stage2-binutils ; \
-         mv prev-binutils stage1-binutils ; :  ; \
+       @if test -d $(HOST_SUBDIR)/binutils; then \
+         cd $(HOST_SUBDIR); mv binutils stage3-binutils; \
+         mv prev-binutils stage2-binutils; : ; \
         fi
  @endif binutils
  @if fixincludes
-       @if test -d $(HOST_SUBDIR)/fixincludes ; then \
-         cd $(HOST_SUBDIR); mv fixincludes stage2-fixincludes ; \
-         mv prev-fixincludes stage1-fixincludes ; :  ; \
+       @if test -d $(HOST_SUBDIR)/fixincludes; then \
+         cd $(HOST_SUBDIR); mv fixincludes stage3-fixincludes; \
+         mv prev-fixincludes stage2-fixincludes; : ; \
         fi
  @endif fixincludes
  @if gas
-       @if test -d $(HOST_SUBDIR)/gas ; then \
-         cd $(HOST_SUBDIR); mv gas stage2-gas ; \
-         mv prev-gas stage1-gas ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stage3-gas; \
+         mv prev-gas stage2-gas; : ; \
         fi
  @endif gas
  @if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stage2-gcc ; \
-         mv prev-gcc stage1-gcc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stage3-gcc; \
+         mv prev-gcc stage2-gcc; : ; \
         fi
  @endif gcc
  @if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stage2-gmp ; \
-         mv prev-gmp stage1-gmp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gmp; then \
+         cd $(HOST_SUBDIR); mv gmp stage3-gmp; \
+         mv prev-gmp stage2-gmp; : ; \
         fi
  @endif gmp
  @if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stage2-mpfr ; \
-         mv prev-mpfr stage1-mpfr ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpfr; then \
+         cd $(HOST_SUBDIR); mv mpfr stage3-mpfr; \
+         mv prev-mpfr stage2-mpfr; : ; \
         fi
  @endif mpfr
  @if mpc
-       @if test -d $(HOST_SUBDIR)/mpc ; then \
-         cd $(HOST_SUBDIR); mv mpc stage2-mpc ; \
-         mv prev-mpc stage1-mpc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpc; then \
+         cd $(HOST_SUBDIR); mv mpc stage3-mpc; \
+         mv prev-mpc stage2-mpc; : ; \
         fi
  @endif mpc
  @if isl
-       @if test -d $(HOST_SUBDIR)/isl ; then \
-         cd $(HOST_SUBDIR); mv isl stage2-isl ; \
-         mv prev-isl stage1-isl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stage3-isl; \
+         mv prev-isl stage2-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 ; :  ; \
+       @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 stage2-gold ; \
-         mv prev-gold stage1-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 stage2-intl ; \
-         mv prev-intl stage1-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 stage2-ld ; \
-         mv prev-ld stage1-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 stage2-libbacktrace ; \
-         mv prev-libbacktrace stage1-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 stage2-libcpp ; \
-         mv prev-libcpp stage1-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 stage2-libdecnumber ; \
-         mv prev-libdecnumber stage1-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 stage2-libiberty ; \
-         mv prev-libiberty stage1-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 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 stage3-libiberty-linker-plugin; \
+         mv prev-libiberty-linker-plugin stage2-libiberty-linker-plugin; : ; \
         fi
  @endif libiberty-linker-plugin
-@if zlib
-       @if test -d $(HOST_SUBDIR)/zlib ; then \
-         cd $(HOST_SUBDIR); mv zlib 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
-
-# Bubble a bug fix through all the stages up to stage 2.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured either.
-.PHONY: stage2-bubble
-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 ; \
-       else \
-         $(MAKE) stage2-start; \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \
-       fi
-
-.PHONY: all-stage2 clean-stage2
-do-clean: clean-stage2
-
-# 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
-
-
-
-.PHONY: bootstrap2 bootstrap2-lean
-bootstrap2:
-       echo stage2 > stage_final
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-bootstrap2-lean:
-       echo stage2 > stage_final
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage2-bubble
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage1:: distclean-stage2 
-.PHONY: distclean-stage2
-distclean-stage2::
-       @: $(MAKE); $(stage)
-       @test "`cat stage_last`" != stage2 || rm -f stage_last
-       rm -rf stage2-* 
-
-
-@endif gcc-bootstrap
-
-
-.PHONY: stage3-start stage3-end
-
-stage3-start::
-       @: $(MAKE); $(stage); \
-       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 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 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 stage2-binutils prev-binutils || test -f stage2-lean 
-@endif binutils
-@if fixincludes
-       @cd $(HOST_SUBDIR); [ -d stage3-fixincludes ] || \
-         mkdir stage3-fixincludes; \
-       mv stage3-fixincludes fixincludes  ; \
-       mv stage2-fixincludes prev-fixincludes || test -f stage2-lean 
-@endif fixincludes
-@if gas
-       @cd $(HOST_SUBDIR); [ -d stage3-gas ] || \
-         mkdir stage3-gas; \
-       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 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 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 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 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 stage2-isl prev-isl || test -f stage2-lean 
-@endif isl
-@if libelf
-       @cd $(HOST_SUBDIR); [ -d stage3-libelf ] || \
-         mkdir stage3-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 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 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 stage2-ld prev-ld || test -f stage2-lean 
-@endif ld
-@if libbacktrace
-       @cd $(HOST_SUBDIR); [ -d stage3-libbacktrace ] || \
-         mkdir stage3-libbacktrace; \
-       mv stage3-libbacktrace libbacktrace  ; \
-       mv stage2-libbacktrace prev-libbacktrace || test -f stage2-lean 
-@endif libbacktrace
-@if libcpp
-       @cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \
-         mkdir stage3-libcpp; \
-       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 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 stage2-libiberty prev-libiberty || test -f stage2-lean 
-@endif libiberty
-@if libiberty-linker-plugin
-       @cd $(HOST_SUBDIR); [ -d stage3-libiberty-linker-plugin ] || \
-         mkdir stage3-libiberty-linker-plugin; \
-       mv stage3-libiberty-linker-plugin libiberty-linker-plugin  ; \
-       mv stage2-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage2-lean 
-@endif libiberty-linker-plugin
-@if zlib
-       @cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \
-         mkdir stage3-zlib; \
-       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 stage2-lto-plugin prev-lto-plugin || test -f stage2-lean 
-@endif lto-plugin
-       @[ -d stage3-$(TARGET_SUBDIR) ] || \
-         mkdir stage3-$(TARGET_SUBDIR); \
-       mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-       mv 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 ; :  ; \
-       fi
-@endif bfd
-@if 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 ; :  ; \
-       fi
-@endif binutils
-@if fixincludes
-       @if test -d $(HOST_SUBDIR)/fixincludes ; then \
-         cd $(HOST_SUBDIR); mv fixincludes stage3-fixincludes ; \
-         mv prev-fixincludes stage2-fixincludes ; :  ; \
-       fi
-@endif fixincludes
-@if gas
-       @if test -d $(HOST_SUBDIR)/gas ; then \
-         cd $(HOST_SUBDIR); mv gas stage3-gas ; \
-         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 ; :  ; \
-       fi
-@endif gcc
-@if 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 ; :  ; \
-       fi
-@endif mpfr
-@if 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 ; :  ; \
-       fi
-@endif isl
-@if 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 ; :  ; \
-       fi
-@endif gold
-@if 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 ; :  ; \
-       fi
-@endif ld
-@if libbacktrace
-       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
-         cd $(HOST_SUBDIR); mv libbacktrace stage3-libbacktrace ; \
-         mv prev-libbacktrace stage2-libbacktrace ; :  ; \
-       fi
-@endif libbacktrace
-@if libcpp
-       @if test -d $(HOST_SUBDIR)/libcpp ; then \
-         cd $(HOST_SUBDIR); mv libcpp stage3-libcpp ; \
-         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 ; :  ; \
-       fi
-@endif libdecnumber
-@if 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 libiconv
+       @if test -d $(HOST_SUBDIR)/libiconv; then \
+         cd $(HOST_SUBDIR); mv libiconv stage3-libiconv; \
+         mv prev-libiconv stage2-libiconv; : ; \
         fi
-@endif libiberty-linker-plugin
+@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 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
  
@@ -46823,13 +48749,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
@@ -46846,16 +48772,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; \
@@ -46865,16 +48791,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-*; \
@@ -46935,270 +48861,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 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
         @[ -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 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 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
  
@@ -47209,13 +49147,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
@@ -47232,16 +49170,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; \
@@ -47251,16 +49189,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-*; \
@@ -47309,270 +49247,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 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
         @[ -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 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 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
  
@@ -47583,8 +49533,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; \
@@ -47616,270 +49566,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 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
         @[ -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 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 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
  
@@ -47890,8 +49852,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; \
@@ -47950,10 +49912,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
@@ -47996,6 +49958,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
@@ -48039,6 +50007,7 @@ configure-target-libatomic: stage_last
  @if gcc-no-bootstrap
  configure-target-libstdc++-v3: maybe-all-gcc
  configure-target-libsanitizer: maybe-all-gcc
+configure-target-libmpx: maybe-all-gcc
  configure-target-libvtv: maybe-all-gcc
  configure-target-libcilkrts: maybe-all-gcc
  configure-target-liboffloadmic: maybe-all-gcc
@@ -48178,6 +50147,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
@@ -48322,6 +50299,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
@@ -48374,6 +50359,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
@@ -48390,6 +50383,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
@@ -48418,7 +50419,16 @@ all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty-linker-plugin
  all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty-linker-plugin
  configure-libcc1: maybe-configure-gcc
  all-libcc1: maybe-all-gcc
+all-gotools: maybe-all-target-libgo
  all-utils: maybe-all-libiberty
+configure-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
@@ -48443,6 +50453,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
+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
@@ -48492,6 +50510,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
@@ -48884,7 +50910,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-configure-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
@@ -48905,6 +50931,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
@@ -48925,6 +50952,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
@@ -48942,6 +50975,7 @@ 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
@@ -48971,6 +51005,8 @@ configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss
  
  configure-target-libsanitizer: maybe-all-target-newlib maybe-all-target-libgloss
  
+configure-target-libmpx: maybe-all-target-newlib maybe-all-target-libgloss
+
  configure-target-libvtv: maybe-all-target-newlib maybe-all-target-libgloss
  
  configure-target-libcilkrts: maybe-all-target-newlib maybe-all-target-libgloss
@@ -48999,6 +51035,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